diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java
index b30bf3742..283577982 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java
@@ -1,526 +1,527 @@
-package apx.com.amarsoft.als.base.awe.select;
-
-import java.sql.ResultSetMetaData;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.servlet.http.HttpServletRequest;
-
-import jbo.sys.SELECT_CATALOG;
-import apx.com.amarsoft.als.base.cache.instance.AppCodeCache;
-
-import com.amarsoft.are.ARE;
-import com.amarsoft.are.jbo.BizObject;
-import com.amarsoft.are.jbo.BizObjectManager;
-import com.amarsoft.are.jbo.BizObjectQuery;
-import com.amarsoft.are.jbo.JBOFactory;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.are.lang.StringX;
-import com.amarsoft.awe.util.ASResultSet;
-import com.amarsoft.awe.util.SqlObject;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.MultipartDataUtil;
-import com.base.util.RequestUtil;
-
-public class SelectCatalogWin {
-	private String sSelName;
-	private boolean loadSelectflag = true;
-	private Map<String, Object> param;
-
-	public boolean isLoadSelectflag() {
-		return loadSelectflag;
-	}
-
-	public void setsSelName(String sSelName) {
-		this.sSelName = sSelName;
-	}
-
-	public void setParam(String sKey, String sValue) {
-		this.param.put(sKey, sValue);
-	}
-
-	private String sGlobalText;
-
-	@SuppressWarnings("unchecked")
-	public SelectCatalogWin(String sSelName, JBOTransaction tx,
-			Transaction Sqlca, HttpServletRequest request) throws Exception {
-		param = new HashMap<String, Object>();
-		String sRequestMethod = request.getMethod();
-		Map<String, Object> paramMap1 = new HashMap<String, Object>();
-		if (sRequestMethod.equalsIgnoreCase("GET")) {
-			paramMap1 = RequestUtil.convertRequestToMap(request);
-		} else {
-			this.param = (Map<String, Object>) MultipartDataUtil
-					.readRequestParam(request, "UTF-8");
-			this.param = (Map<String, Object>) this.param.get("fieldMap");
-		}
-		if (param.size() > 0) {
-			for (String key : param.keySet()) {
-				if (key.toLowerCase().equals("globaltext")) {
-					sGlobalText = param.get("globaltext") == null ? null
-							: param.get("globaltext").toString();
-				} else {
-					param.put(key.toLowerCase(), param.get(key));
-					param.put(key.toUpperCase(), param.get(key));
-					param.put(key, param.get(key));
-				}
-			}
-		}
-		if (paramMap1.size() > 0) {
-			for (String key : paramMap1.keySet()) {
-				if (key.toLowerCase().equals("globaltext")) {
-					sGlobalText = paramMap1.get("globaltext") == null ? null
-							: paramMap1.get("globaltext").toString();
-				} else {
-					param.put(key.toLowerCase(), paramMap1.get(key));
-					param.put(key.toUpperCase(), paramMap1.get(key));
-					param.put(key, paramMap1.get(key));
-				}
-			}
-		}
-		this.sSelName = sSelName;
-		try {
-			BizObjectManager bom = JBOFactory
-					.getBizObjectManager(SELECT_CATALOG.CLASS_NAME);
-			BizObjectQuery boq = bom.createQuery("SELNAME=:SELNAME")
-					.setParameter("SELNAME", this.sSelName);
-			BizObject bo = boq.getSingleResult(false);
-
-			if (null == bo) {
-				this.loadSelectflag = false;
-			}
-			this.sSelDescribe = bo.getAttribute("SELDESCRIBE") == null ? ""
-					: bo.getAttribute("SELDESCRIBE").toString();
-			this.sSelHideField = bo.getAttribute("SELHIDEFIELD") == null ? ""
-					: bo.getAttribute("SELHIDEFIELD").toString();
-			this.sSelCode = bo.getAttribute("SELCODE") == null ? "" : bo
-					.getAttribute("SELCODE").toString();
-			this.sSelFieldName = bo.getAttribute("SELFIELDNAME") == null ? ""
-					: bo.getAttribute("SELFIELDNAME").toString();
-			this.sSelReturnValue = bo.getAttribute("SELRETURNVALUE") == null ? ""
-					: bo.getAttribute("SELRETURNVALUE").toString();
-			// doTemp.setCheckFormat(
-			this.sAttribute3 = bo.getAttribute("Attribute3") == null ? "" : bo
-					.getAttribute("Attribute3").getString();
-			// 若1则 doTemp.WhereClauseNoFilter += " and 1=2 ";
-			this.sAttribute4 = bo.getAttribute("Attribute4") == null ? "" : bo
-					.getAttribute("Attribute4").getString();
-			// 设置下拉框来源
-			this.sAttribute5 = bo.getAttribute("Attribute5") == null ? "" : bo
-					.getAttribute("Attribute5").getString();
-
-			this.sSelFilterField = bo.getAttribute("SelFilterField") == null ? ""
-					: bo.getAttribute("SelFilterField").getString();
-
-		} catch (Exception e) {
-			ARE.getLog().error(e);
-			this.loadSelectflag = false;
-		}
-	}
-
-	private String sSelDescribe;
-
-	private String sSelHideField;
-
-	private String sSelCode;
-
-	private String sSelFieldName;
-
-	private String sSelReturnValue;
-
-	private String sAttribute3;
-	private String sAttribute4;
-	private String sAttribute5;
-	private String sSelFilterField;
-
-	public Map<String, Object> execute(JBOTransaction tx, Transaction Sqlca,
-			HttpServletRequest request) throws Exception {
-		return execute(tx, Sqlca, request, null);
-	}
-
-	public Map<String, Object> execute(JBOTransaction tx, Transaction Sqlca,
-			HttpServletRequest request, String sOtherWhere) throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (!this.loadSelectflag) {
-			map.put("datas", map);
-			return map;
-		}
-		Map<String, Object> paramMap = new HashMap<String, Object>();
-
-		if (param.size() > 0) {
-			for (String key : param.keySet()) {
-				paramMap.put("#" + key, param.get(key));
-			}
-		}
-
-		map.put("describer", this.sSelDescribe);
-		String sql = this.sSelCode;
-
-		if (paramMap.size() > 0) {
-			for (String sKey : paramMap.keySet()) {
-				sql = sql.replace(sKey, paramMap.get(sKey) == null ? ""
-						: paramMap.get(sKey).toString());
-			}
-		}
-		sql = sql.trim();
-		// KeyFilter加快查询速度
-		StringTokenizer stFilter = new StringTokenizer(sAttribute4, "@");
-		String sFilter = "";
-		while (stFilter.hasMoreTokens()) {
-			String sFilterValue = stFilter.nextToken().trim();
-			sFilter = sFilter + " " + sFilterValue;
-		}
-		sFilter = sFilter.trim();
-		if (sFilter.length() > 0) {
-			// doTemp.setKeyFilter(sSelPrimaryKey);
-			String sSql = sql.toLowerCase();
-			String sSFilter = sFilter.toLowerCase();
-			if (sSql.contains("where") || sSFilter.contains("where")) {
-				sql += sFilter;
-			} else {
-				sql += " where " + sFilter;
-			}
-		}
-		String sql2 = " and (";
-		// sGlobalText
-		if (sGlobalText != null && sGlobalText.length() > 0)
-			sGlobalText = sGlobalText.trim();
-		if ((sGlobalText != null && sGlobalText.length() > 0)
-				&& sSelFilterField.length() > 0) {
-			String sql3 = sql;
-			sql3 = sql3.toLowerCase();
-			sql3 = sql3.substring(0, sql3.indexOf("from"));
-			String[] aArray = sSelFilterField.split(",");
-			int i = 0;
-			for (String sSelectFilter : aArray) {
-				String sTableName = sql3.substring(0,
-						sql3.indexOf(sSelectFilter.toLowerCase()));
-				sTableName = sTableName
-						.substring(sTableName.lastIndexOf(",") + 1);
-				if (i > 0) {
-					sql2 += " or ";
-				}
-				sql2 += sTableName + sSelectFilter + " like '%" + sGlobalText
-						+ "%'";
-				i++;
-			}
-			sql2 += ")";
-			String sSql = sql.toLowerCase();
-			String sSql2 = sql2.toLowerCase();
-			if (sSql.contains("where") || sSql2.contains("where")) {
-				sql += sql2;
-			} else {
-				sql += " where " + sql2;
-			}
-		}
-		if (!StringX.isSpace(sOtherWhere)) {
-			String[] array = sOtherWhere.split("&");
-			sql = sql.replace(array[0], array[1]);
-		}
-		sql = sql.trim();
-		sql = sql.replace("\r\n", " ");
-		while (sql.contains("  ")) {
-			sql = sql.replace("  ", " ");
-		}
-		ARE.getLog().info("sql > " + sql);
-		String sPageIndex = request.getParameter("pageIndex");
-		String sLimit = request.getParameter("limit");
-		if (sPageIndex == null)
-			sPageIndex = "1";
-		if (sLimit == null)
-			sLimit = "10";
-		int iPageIndex, iLimit;
-		iPageIndex = Integer.valueOf(sPageIndex);
-		iPageIndex = iPageIndex - 1;
-		iLimit = Integer.valueOf(sLimit);
-		int pageIndexStart = (iPageIndex) * iLimit;
-		int pageIndexEnd = (iPageIndex + 1) * iLimit;
-//		sql = "SELECT * FROM (" + sql + ") A	WHERE tenwaROWNUM BETWEEN "
-//				+ pageIndexStart + " AND " + pageIndexEnd;
-		
-		sql = "SELECT * FROM (" + sql + ") A limit " + pageIndexStart + "," + pageIndexEnd;
-		String[] aSelReturnValue = sSelReturnValue.split("@");
-		String[] aSelFieldName = sSelFieldName.split(",");
-		String[] aSelHideField = sSelHideField.split(",");
-		String sFilters = "";
-
-		String sql1 = sql.toLowerCase();
-		List<Map<String, Object>> hms = new ArrayList<Map<String, Object>>();
-		if (sql1.startsWith("select")) {
-			ASResultSet rs = null;
-			SqlObject sqlObject = new SqlObject(sql);
-			rs = Sqlca.getResultSet(sqlObject);
-			while (rs.next()) {
-				ResultSetMetaData rsmd = rs.getMetaData();
-				Map<String, Object> row = new HashMap<String, Object>();
-				int count = rsmd.getColumnCount();
-				List<Map<String, Object>> colList = new ArrayList<Map<String, Object>>();
-				for (int i = 1; i <= aSelFieldName.length; i++) {
-					Map<String, Object> col = new HashMap<String, Object>();
-					String key = rsmd.getColumnLabel(i);
-					String value = rs.getString(i);
-					col.put("code", key);
-					col.put("value", value);
-					col.put("itemno", value);
-					col.put("isHidden", false);
-					col.put("isReturn", false);
-					if (sAttribute5.length() > 0) {
-						querySource(sAttribute5, col, tx, Sqlca);
-					}
-					col.put("colcheckformat", "1");
-					if (sAttribute3.length() > 0) {
-						colCheckFormart(sAttribute3, col);
-					}
-
-					// 隐藏域 ,
-					for (String str : aSelHideField) {
-						if (str.equalsIgnoreCase(key)) {
-							col.put("isHidden", true);
-							break;
-						}
-					}
-					// 返回域 @
-					for (String str : aSelReturnValue) {
-						if (str.equalsIgnoreCase(key)) {
-							col.put("isReturn", true);
-							break;
-						}
-					}
-					// 显示名 ,
-					try {
-						col.put("display", aSelFieldName[i-1]);
-					} catch (Exception e) {
-						ARE.getLog().error(e);
-						col.put("display", "");
-					}
-					colList.add(col);
-				}
-				row.put("row", colList);
-				hms.add(row);
-			}
-		} else {
-			boolean bResult = Sqlca.equals(new SqlObject(sql));
-			map.put("executeResult", bResult);
-		}
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		int j = 0;
-		for (Map<String, Object> cache : hms) {
-			cache = hms.get(j);
-			list.add(cache);
-			j++;
-		}
-		sFilters = takeFilterName(sSelFilterField, sSelFieldName, sSelCode,
-				Sqlca, sOtherWhere);
-		sFilters = sFilters.trim();
-		if (sFilters.endsWith(","))
-			sFilters = sFilters.substring(0, sFilters.length() - 1);
-		map.put("selFilterField", sFilters);
-		map.put("datas", list);
-		return map;
-	}
-
-	// begin 字段处理
-	/**
-	 * 
-	 * 获取过滤中文字符串
-	 * 
-	 * @param sStr
-	 *            过滤字段.
-	 * @param sStr2
-	 *            显示中文名.
-	 * @param sql
-	 * @param sqlca
-	 * @return String filter name 过滤字段中文名.
-	 * @throws Exception
-	 */
-	private static String takeFilterName(String sStr, String sStr2, String sql,
-			Transaction sqlca, String sOtherWhere) throws Exception {
-		if (!StringX.isSpace(sOtherWhere)) {
-			String[] array = sOtherWhere.split("&");
-			sql = sql.replace(array[0], array[1]);
-		}
-		sql = sql.trim();
-		sql = sql.replace("\r\n", " ");
-		while (sql.contains("  ")) {
-			sql = sql.replace("  ", " ");
-		}
-		String sSql = sql;
-		sSql = sSql.trim();
-		if (StringX.isSpace(sStr) || StringX.isSpace(sStr2)
-				|| StringX.isSpace(sSql)) {
-			return "";
-		}
-		String sSqlContext = sSql;
-		sSqlContext = sSqlContext.toLowerCase();
-		if (sSqlContext.contains("group by")) {
-			String sSqlContextGroupAfter = sSqlContext.substring(
-					sSqlContext.lastIndexOf("group by")).trim();
-			String sSqlContextGroupBefore = sSqlContext.substring(0,
-					sSqlContext.lastIndexOf("group by")).trim();
-			if (sSqlContextGroupBefore.contains(" where ")) {
-				sSqlContextGroupBefore += " and 1=2";
-			} else {
-				sSqlContextGroupBefore += " where 1=2";
-			}
-			sSql = sSqlContextGroupBefore + " " + sSqlContextGroupAfter;
-		} else {
-			if (sSqlContext.contains("order by")) {
-				String sSqlContextOrderAfter = sSqlContext.substring(
-						sSqlContext.lastIndexOf("order by")).trim();
-				String sSqlContextOrderBefore = sSqlContext.substring(0,
-						sSqlContext.lastIndexOf("order by")).trim();
-				if (sSqlContextOrderBefore.contains(" where ")) {
-					sSqlContextOrderBefore += " and 1=2";
-				} else {
-					sSqlContextOrderBefore += " where 1=2";
-				}
-				sSql = sSqlContextOrderBefore + " " + sSqlContextOrderAfter;
-			}
-		}
-		String sFilters = "";
-		String[] aSelFieldName = sStr2.split(",");
-		ASResultSet rs = null;
-		SqlObject sqlObject = new SqlObject(sSql);
-		rs = sqlca.getResultSet(sqlObject);
-		ResultSetMetaData rsmd = rs.getMetaData();
-		int count = rsmd.getColumnCount();
-		for (int i = 1; i <= count; i++) {
-			String key = rsmd.getColumnLabel(i);
-			String[] array = sStr.split(",");
-			for (String sKey : array) {
-				if (sKey.toLowerCase().equals(key.toLowerCase().toLowerCase())) {
-					sFilters += aSelFieldName[i - 1] + ",";
-				}
-			}
-		}
-
-		return sFilters;
-	}
-
-	/**
-	 * 
-	 * 获取字段格式
-	 * 
-	 * @param sStr
-	 *            sAttribute3
-	 * @param col
-	 */
-	@SuppressWarnings("unused")
-	private static void colCheckFormart(String sStr, Map<String, Object> col) {
-		String sCode = col.get("code").toString();
-		StringTokenizer stFilter = new StringTokenizer(sStr, "@");
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		while (stFilter.hasMoreTokens()) {
-			String sColumnList = stFilter.nextToken().trim();
-			String sCheckFormart = stFilter.nextToken().trim();
-			sCheckFormart = sCheckFormart == null ? "" : sCheckFormart;
-			sCheckFormart = sCheckFormart.trim();
-			sCheckFormart = sCheckFormart.equals("") ? "1" : sCheckFormart;
-			if (sCode.equals(sColumnList)) {
-				col.put("colcheckformat", sCheckFormart);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 * 获取字段来源
-	 * 
-	 * @param sStr
-	 *            sAttribute5
-	 * @param col
-	 * @param tx
-	 * @param sqlca
-	 * @throws Exception
-	 */
-	private static void querySource(String sStr, Map<String, Object> col,
-			JBOTransaction tx, Transaction sqlca) throws Exception {
-		String sCode = col.get("code").toString();
-		StringTokenizer stFilter = new StringTokenizer(sStr, "@");
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		while (stFilter.hasMoreTokens()) {
-			String sFilterOptions = null;
-			String sColumnList = stFilter.nextToken().trim();
-			String sSourceType = stFilter.nextToken().trim();
-			String sSource = stFilter.nextToken().trim();
-			if (stFilter.hasMoreTokens())
-				sFilterOptions = stFilter.nextToken().trim();
-			Map<String, Object> map = new HashMap<String, Object>();
-			// map.put("col", sColumnList);
-			map.put("type", sSourceType);
-			map.put("source", sSource);
-			map.put("sFilterOptions", sFilterOptions);
-			if (sCode.toUpperCase().equals(sColumnList.toUpperCase()))
-				list.add(map);
-		}
-		for (Map<String, Object> map : list) {
-			System.out.println("col:" + map.get("col") + ", type:"
-					+ map.get("type") + "source:" + map.get("source"));
-			queryprocess(map, col, tx, sqlca);
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private static void queryprocess(Map<String, Object> map,
-			Map<String, Object> col, JBOTransaction tx, Transaction sqlca)
-			throws Exception {
-		String sValue = col.get("value").toString();
-		// String sColumnList = map.get("col").toString();
-		String sSourceType = map.get("type").toString();
-		String sSource = map.get("source").toString();
-		if ("code".equalsIgnoreCase(sSourceType)) {
-			List<Map<String, Object>> codeLibrary = null;
-			try {
-				codeLibrary = (List<Map<String, Object>>) ((Map<String, Object>) AppCodeCache
-						.getAppCodeCachePool().get(sSource)).get("library");
-			} catch (Exception e) {
-				col.put("value", sValue);
-			}
-			if (codeLibrary != null) {
-				for (Map<String, Object> code : codeLibrary) {
-					String sItemNo = code.get("ITEMNO".toLowerCase()) == null ? ""
-							: code.get("ITEMNO".toLowerCase()).toString();
-					if (sItemNo.trim().toLowerCase().equals(sValue)) {
-						String sItemName = code.get("ITEMNAME".toLowerCase()) == null ? ""
-								: code.get("ITEMNAME".toLowerCase()).toString();
-						col.put("value", sItemName);
-						break;
-					}
-				}
-			}
-		} else if ("sql".equalsIgnoreCase(sSourceType)) {
-			try {
-				String sSource1 = sSource;
-				sSource1 = sSource1.trim();
-				sSource1 = sSource1.substring(sSource1.indexOf(" "),
-						sSource1.length());
-				sSource1 = sSource1.trim();
-				sSource1 = sSource1.substring(0, sSource1.indexOf(" "));
-				sSource1 = sSource1.trim();
-				String[] array = sSource1.split(",");
-				String itemno = array[0].trim();
-				String itemname = array[1].trim();
-
-				ASResultSet rs = null;
-				SqlObject sqlObject = new SqlObject(sSource);
-				rs = sqlca.getResultSet(sqlObject);
-				while (rs.next()) {
-					String sItemNo = rs.getStringValue(itemno).toString();
-					String sItemName = rs.getStringValue(itemname).toString();
-					if (sItemNo.equals(sValue)) {
-						col.put("value", sItemName);
-						break;
-					}
-				}
-			} catch (Exception e) {
-				col.put("value", sValue);
-			}
-		} else if ("codetable".equalsIgnoreCase(sSourceType)) {
-
-		}
-	}
-	// end
-}
+package apx.com.amarsoft.als.base.awe.select;
+
+import java.sql.ResultSetMetaData;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import jbo.sys.SELECT_CATALOG;
+import apx.com.amarsoft.als.base.cache.instance.AppCodeCache;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.lang.StringX;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.MultipartDataUtil;
+import com.base.util.RequestUtil;
+
+public class SelectCatalogWin {
+	private String sSelName;
+	private boolean loadSelectflag = true;
+	private Map<String, Object> param;
+
+	public boolean isLoadSelectflag() {
+		return loadSelectflag;
+	}
+
+	public void setsSelName(String sSelName) {
+		this.sSelName = sSelName;
+	}
+
+	public void setParam(String sKey, String sValue) {
+		this.param.put(sKey, sValue);
+	}
+
+	private String sGlobalText;
+
+	@SuppressWarnings("unchecked")
+	public SelectCatalogWin(String sSelName, JBOTransaction tx,
+			Transaction Sqlca, HttpServletRequest request) throws Exception {
+		param = new HashMap<String, Object>();
+		String sRequestMethod = request.getMethod();
+		Map<String, Object> paramMap1 = new HashMap<String, Object>();
+		if (sRequestMethod.equalsIgnoreCase("GET")) {
+			paramMap1 = RequestUtil.convertRequestToMap(request);
+		} else {
+			this.param = (Map<String, Object>) MultipartDataUtil
+					.readRequestParam(request, "UTF-8");
+			this.param = (Map<String, Object>) this.param.get("fieldMap");
+		}
+		if (param.size() > 0) {
+			for (String key : param.keySet()) {
+				if (key.toLowerCase().equals("globaltext")) {
+					sGlobalText = param.get("globaltext") == null ? null
+							: param.get("globaltext").toString();
+				} else {
+					param.put(key.toLowerCase(), param.get(key));
+					param.put(key.toUpperCase(), param.get(key));
+					param.put(key, param.get(key));
+				}
+			}
+		}
+		if (paramMap1.size() > 0) {
+			for (String key : paramMap1.keySet()) {
+				if (key.toLowerCase().equals("globaltext")) {
+					sGlobalText = paramMap1.get("globaltext") == null ? null
+							: paramMap1.get("globaltext").toString();
+				} else {
+					param.put(key.toLowerCase(), paramMap1.get(key));
+					param.put(key.toUpperCase(), paramMap1.get(key));
+					param.put(key, paramMap1.get(key));
+				}
+			}
+		}
+		this.sSelName = sSelName;
+		try {
+			BizObjectManager bom = JBOFactory
+					.getBizObjectManager(SELECT_CATALOG.CLASS_NAME);
+			BizObjectQuery boq = bom.createQuery("SELNAME=:SELNAME")
+					.setParameter("SELNAME", this.sSelName);
+			BizObject bo = boq.getSingleResult(false);
+
+			if (null == bo) {
+				this.loadSelectflag = false;
+			}
+			this.sSelDescribe = bo.getAttribute("SELDESCRIBE") == null ? ""
+					: bo.getAttribute("SELDESCRIBE").toString();
+			this.sSelHideField = bo.getAttribute("SELHIDEFIELD") == null ? ""
+					: bo.getAttribute("SELHIDEFIELD").toString();
+			this.sSelCode = bo.getAttribute("SELCODE") == null ? "" : bo
+					.getAttribute("SELCODE").toString();
+			this.sSelFieldName = bo.getAttribute("SELFIELDNAME") == null ? ""
+					: bo.getAttribute("SELFIELDNAME").toString();
+			this.sSelReturnValue = bo.getAttribute("SELRETURNVALUE") == null ? ""
+					: bo.getAttribute("SELRETURNVALUE").toString();
+			// doTemp.setCheckFormat(
+			this.sAttribute3 = bo.getAttribute("Attribute3") == null ? "" : bo
+					.getAttribute("Attribute3").getString();
+			// 若1则 doTemp.WhereClauseNoFilter += " and 1=2 ";
+			this.sAttribute4 = bo.getAttribute("Attribute4") == null ? "" : bo
+					.getAttribute("Attribute4").getString();
+			// 设置下拉框来源
+			this.sAttribute5 = bo.getAttribute("Attribute5") == null ? "" : bo
+					.getAttribute("Attribute5").getString();
+
+			this.sSelFilterField = bo.getAttribute("SelFilterField") == null ? ""
+					: bo.getAttribute("SelFilterField").getString();
+
+		} catch (Exception e) {
+			ARE.getLog().error(e);
+			this.loadSelectflag = false;
+		}
+	}
+
+	private String sSelDescribe;
+
+	private String sSelHideField;
+
+	private String sSelCode;
+
+	private String sSelFieldName;
+
+	private String sSelReturnValue;
+
+	private String sAttribute3;
+	private String sAttribute4;
+	private String sAttribute5;
+	private String sSelFilterField;
+
+	public Map<String, Object> execute(JBOTransaction tx, Transaction Sqlca,
+			HttpServletRequest request) throws Exception {
+		return execute(tx, Sqlca, request, null);
+	}
+
+	public Map<String, Object> execute(JBOTransaction tx, Transaction Sqlca,
+			HttpServletRequest request, String sOtherWhere) throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (!this.loadSelectflag) {
+			map.put("datas", map);
+			return map;
+		}
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+
+		if (param.size() > 0) {
+			for (String key : param.keySet()) {
+				paramMap.put("#" + key, param.get(key));
+			}
+		}
+
+		map.put("describer", this.sSelDescribe);
+		String sql = this.sSelCode;
+
+		if (paramMap.size() > 0) {
+			for (String sKey : paramMap.keySet()) {
+				sql = sql.replace(sKey, paramMap.get(sKey) == null ? ""
+						: paramMap.get(sKey).toString());
+			}
+		}
+		sql = sql.trim();
+		// KeyFilter加快查询速度
+		StringTokenizer stFilter = new StringTokenizer(sAttribute4, "@");
+		String sFilter = "";
+		while (stFilter.hasMoreTokens()) {
+			String sFilterValue = stFilter.nextToken().trim();
+			sFilter = sFilter + " " + sFilterValue;
+		}
+		sFilter = sFilter.trim();
+		if (sFilter.length() > 0) {
+			// doTemp.setKeyFilter(sSelPrimaryKey);
+			String sSql = sql.toLowerCase();
+			String sSFilter = sFilter.toLowerCase();
+			if (sSql.contains("where") || sSFilter.contains("where")) {
+				sql += sFilter;
+			} else {
+				sql += " where " + sFilter;
+			}
+		}
+		String sql2 = " and (";
+		// sGlobalText
+		if (sGlobalText != null && sGlobalText.length() > 0)
+			sGlobalText = sGlobalText.trim();
+		if ((sGlobalText != null && sGlobalText.length() > 0)
+				&& sSelFilterField.length() > 0) {
+			String sql3 = sql;
+			sql3 = sql3.toLowerCase();
+			sql3 = sql3.substring(0, sql3.indexOf("from"));
+			String[] aArray = sSelFilterField.split(",");
+			int i = 0;
+			for (String sSelectFilter : aArray) {
+				String sTableName = sql3.substring(0,
+						sql3.indexOf(sSelectFilter.toLowerCase()));
+				sTableName = sTableName
+						.substring(sTableName.lastIndexOf(",") + 1);
+				if (i > 0) {
+					sql2 += " or ";
+				}
+				sql2 += sTableName + sSelectFilter + " like '%" + sGlobalText
+						+ "%'";
+				i++;
+			}
+			sql2 += ")";
+			String sSql = sql.toLowerCase();
+			String sSql2 = sql2.toLowerCase();
+			if (sSql.contains("where") || sSql2.contains("where")) {
+				sql += sql2;
+			} else {
+				sql += " where " + sql2;
+			}
+		}
+		if (!StringX.isSpace(sOtherWhere)) {
+			String[] array = sOtherWhere.split("&");
+			sql = sql.replace(array[0], array[1]);
+		}
+		sql = sql.trim();
+		sql = sql.replace("\r\n", " ");
+		while (sql.contains("  ")) {
+			sql = sql.replace("  ", " ");
+		}
+		ARE.getLog().info("sql > " + sql);
+		String sPageIndex = request.getParameter("pageIndex");
+		String sLimit = request.getParameter("limit");
+		if (sPageIndex == null)
+			sPageIndex = "1";
+		if (sLimit == null)
+			sLimit = "10";
+		int iPageIndex, iLimit;
+		iPageIndex = Integer.valueOf(sPageIndex);
+		iPageIndex = iPageIndex - 1;
+		iLimit = Integer.valueOf(sLimit);
+		int pageIndexStart = (iPageIndex) * iLimit;
+		int pageIndexEnd = (iPageIndex + 1) * iLimit;
+//		sql = "SELECT * FROM (" + sql + ") A	WHERE tenwaROWNUM BETWEEN "
+//				+ pageIndexStart + " AND " + pageIndexEnd;
+		
+		sql = "SELECT * FROM (" + sql + ") A limit " + pageIndexStart + "," + pageIndexEnd;
+		String[] aSelReturnValue = sSelReturnValue.split("@");
+		String[] aSelFieldName = sSelFieldName.split(",");
+		String[] aSelHideField = sSelHideField.split(",");
+		String sFilters = "";
+
+		String sql1 = sql.toLowerCase().replace("{lci,contract}", " ");
+		List<Map<String, Object>> hms = new ArrayList<Map<String, Object>>();
+		if (sql1.startsWith("select")) {
+			ASResultSet rs = null;
+			SqlObject sqlObject = new SqlObject(sql1);
+			rs = Sqlca.getResultSet(sqlObject);
+			while (rs.next()) {
+				ResultSetMetaData rsmd = rs.getMetaData();
+				Map<String, Object> row = new HashMap<String, Object>();
+				int count = rsmd.getColumnCount();
+				List<Map<String, Object>> colList = new ArrayList<Map<String, Object>>();
+				for (int i = 1; i <= aSelFieldName.length; i++) {
+					Map<String, Object> col = new HashMap<String, Object>();
+					String key = rsmd.getColumnLabel(i);
+					String value = rs.getString(i);
+					col.put("code", key);
+					col.put("value", value);
+					col.put("itemno", value);
+					col.put("isHidden", false);
+					col.put("isReturn", false);
+					if (sAttribute5.length() > 0) {
+						querySource(sAttribute5, col, tx, Sqlca);
+					}
+					col.put("colcheckformat", "1");
+					if (sAttribute3.length() > 0) {
+						colCheckFormart(sAttribute3, col);
+					}
+
+					// 隐藏域 ,
+					for (String str : aSelHideField) {
+						if (str.equalsIgnoreCase(key)) {
+							col.put("isHidden", true);
+							break;
+						}
+					}
+					// 返回域 @
+					for (String str : aSelReturnValue) {
+						if (str.equalsIgnoreCase(key)) {
+							col.put("isReturn", true);
+							break;
+						}
+					}
+					// 显示名 ,
+					try {
+						col.put("display", aSelFieldName[i-1]);
+					} catch (Exception e) {
+						ARE.getLog().error(e);
+						col.put("display", "");
+					}
+					colList.add(col);
+				}
+				row.put("row", colList);
+				hms.add(row);
+			}
+		} else {
+			boolean bResult = Sqlca.equals(new SqlObject(sql1));
+			map.put("executeResult", bResult);
+		}
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		int j = 0;
+		for (Map<String, Object> cache : hms) {
+			cache = hms.get(j);
+			list.add(cache);
+			j++;
+		}
+		sFilters = takeFilterName(sSelFilterField, sSelFieldName, sSelCode,
+				Sqlca, sOtherWhere);
+		sFilters = sFilters.trim();
+		if (sFilters.endsWith(","))
+			sFilters = sFilters.substring(0, sFilters.length() - 1);
+		map.put("selFilterField", sFilters);
+		map.put("datas", list);
+		return map;
+	}
+
+	// begin 字段处理
+	/**
+	 * 
+	 * 获取过滤中文字符串
+	 * 
+	 * @param sStr
+	 *            过滤字段.
+	 * @param sStr2
+	 *            显示中文名.
+	 * @param sql
+	 * @param sqlca
+	 * @return String filter name 过滤字段中文名.
+	 * @throws Exception
+	 */
+	private static String takeFilterName(String sStr, String sStr2, String sql,
+			Transaction sqlca, String sOtherWhere) throws Exception {
+		if (!StringX.isSpace(sOtherWhere)) {
+			String[] array = sOtherWhere.split("&");
+			sql = sql.replace(array[0], array[1]);
+		}
+		sql = sql.trim();
+		sql = sql.replace("\r\n", " ");
+		while (sql.contains("  ")) {
+			sql = sql.replace("  ", " ");
+		}
+		String sSql = sql;
+		sSql = sSql.trim();
+		if (StringX.isSpace(sStr) || StringX.isSpace(sStr2)
+				|| StringX.isSpace(sSql)) {
+			return "";
+		}
+		String sSqlContext = sSql;
+		sSqlContext = sSqlContext.toLowerCase();
+		if (sSqlContext.contains("group by")) {
+			String sSqlContextGroupAfter = sSqlContext.substring(
+					sSqlContext.lastIndexOf("group by")).trim();
+			String sSqlContextGroupBefore = sSqlContext.substring(0,
+					sSqlContext.lastIndexOf("group by")).trim();
+			//如果此sql 前部分已经包含where条件，且不在select子查询中，则and相接
+			if (sSqlContextGroupBefore.contains(" where ") && !sSqlContextGroupBefore.contains(")")) {
+				sSqlContextGroupBefore += " and 1=2";
+			} else {
+				sSqlContextGroupBefore += " where 1=2";
+			}
+			sSql = sSqlContextGroupBefore + " " + sSqlContextGroupAfter;
+		} else {
+			if (sSqlContext.contains("order by")) {
+				String sSqlContextOrderAfter = sSqlContext.substring(
+						sSqlContext.lastIndexOf("order by")).trim();
+				String sSqlContextOrderBefore = sSqlContext.substring(0,
+						sSqlContext.lastIndexOf("order by")).trim();
+				if (sSqlContextOrderBefore.contains(" where ")) {
+					sSqlContextOrderBefore += " and 1=2";
+				} else {
+					sSqlContextOrderBefore += " where 1=2";
+				}
+				sSql = sSqlContextOrderBefore + " " + sSqlContextOrderAfter;
+			}
+		}
+		String sFilters = "";
+		String[] aSelFieldName = sStr2.split(",");
+		ASResultSet rs = null;
+		SqlObject sqlObject = new SqlObject(sSql.replace("{lci,contract}", " "));
+		rs = sqlca.getResultSet(sqlObject);
+		ResultSetMetaData rsmd = rs.getMetaData();
+		int count = rsmd.getColumnCount();
+		for (int i = 1; i <= count; i++) {
+			String key = rsmd.getColumnLabel(i);
+			String[] array = sStr.split(",");
+			for (String sKey : array) {
+				if (sKey.toLowerCase().equals(key.toLowerCase().toLowerCase())) {
+					sFilters += aSelFieldName[i - 1] + ",";
+				}
+			}
+		}
+
+		return sFilters;
+	}
+
+	/**
+	 * 
+	 * 获取字段格式
+	 * 
+	 * @param sStr
+	 *            sAttribute3
+	 * @param col
+	 */
+	@SuppressWarnings("unused")
+	private static void colCheckFormart(String sStr, Map<String, Object> col) {
+		String sCode = col.get("code").toString();
+		StringTokenizer stFilter = new StringTokenizer(sStr, "@");
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		while (stFilter.hasMoreTokens()) {
+			String sColumnList = stFilter.nextToken().trim();
+			String sCheckFormart = stFilter.nextToken().trim();
+			sCheckFormart = sCheckFormart == null ? "" : sCheckFormart;
+			sCheckFormart = sCheckFormart.trim();
+			sCheckFormart = sCheckFormart.equals("") ? "1" : sCheckFormart;
+			if (sCode.equals(sColumnList)) {
+				col.put("colcheckformat", sCheckFormart);
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * 获取字段来源
+	 * 
+	 * @param sStr
+	 *            sAttribute5
+	 * @param col
+	 * @param tx
+	 * @param sqlca
+	 * @throws Exception
+	 */
+	private static void querySource(String sStr, Map<String, Object> col,
+			JBOTransaction tx, Transaction sqlca) throws Exception {
+		String sCode = col.get("code").toString();
+		StringTokenizer stFilter = new StringTokenizer(sStr, "@");
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		while (stFilter.hasMoreTokens()) {
+			String sFilterOptions = null;
+			String sColumnList = stFilter.nextToken().trim();
+			String sSourceType = stFilter.nextToken().trim();
+			String sSource = stFilter.nextToken().trim();
+			if (stFilter.hasMoreTokens())
+				sFilterOptions = stFilter.nextToken().trim();
+			Map<String, Object> map = new HashMap<String, Object>();
+			// map.put("col", sColumnList);
+			map.put("type", sSourceType);
+			map.put("source", sSource);
+			map.put("sFilterOptions", sFilterOptions);
+			if (sCode.toUpperCase().equals(sColumnList.toUpperCase()))
+				list.add(map);
+		}
+		for (Map<String, Object> map : list) {
+			System.out.println("col:" + map.get("col") + ", type:"
+					+ map.get("type") + "source:" + map.get("source"));
+			queryprocess(map, col, tx, sqlca);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private static void queryprocess(Map<String, Object> map,
+			Map<String, Object> col, JBOTransaction tx, Transaction sqlca)
+			throws Exception {
+		String sValue = col.get("value").toString();
+		// String sColumnList = map.get("col").toString();
+		String sSourceType = map.get("type").toString();
+		String sSource = map.get("source").toString();
+		if ("code".equalsIgnoreCase(sSourceType)) {
+			List<Map<String, Object>> codeLibrary = null;
+			try {
+				codeLibrary = (List<Map<String, Object>>) ((Map<String, Object>) AppCodeCache
+						.getAppCodeCachePool().get(sSource)).get("library");
+			} catch (Exception e) {
+				col.put("value", sValue);
+			}
+			if (codeLibrary != null) {
+				for (Map<String, Object> code : codeLibrary) {
+					String sItemNo = code.get("ITEMNO".toLowerCase()) == null ? ""
+							: code.get("ITEMNO".toLowerCase()).toString();
+					if (sItemNo.trim().toLowerCase().equals(sValue)) {
+						String sItemName = code.get("ITEMNAME".toLowerCase()) == null ? ""
+								: code.get("ITEMNAME".toLowerCase()).toString();
+						col.put("value", sItemName);
+						break;
+					}
+				}
+			}
+		} else if ("sql".equalsIgnoreCase(sSourceType)) {
+			try {
+				String sSource1 = sSource;
+				sSource1 = sSource1.trim();
+				sSource1 = sSource1.substring(sSource1.indexOf(" "),
+						sSource1.length());
+				sSource1 = sSource1.trim();
+				sSource1 = sSource1.substring(0, sSource1.indexOf(" "));
+				sSource1 = sSource1.trim();
+				String[] array = sSource1.split(",");
+				String itemno = array[0].trim();
+				String itemname = array[1].trim();
+
+				ASResultSet rs = null;
+				SqlObject sqlObject = new SqlObject(sSource);
+				rs = sqlca.getResultSet(sqlObject);
+				while (rs.next()) {
+					String sItemNo = rs.getStringValue(itemno).toString();
+					String sItemName = rs.getStringValue(itemname).toString();
+					if (sItemNo.equals(sValue)) {
+						col.put("value", sItemName);
+						break;
+					}
+				}
+			} catch (Exception e) {
+				col.put("value", sValue);
+			}
+		} else if ("codetable".equalsIgnoreCase(sSourceType)) {
+
+		}
+	}
+	// end
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java
index bce55f2fb..0a17bda10 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java
@@ -1,100 +1,126 @@
-package apx.com.amarsoft.als.currency.select.apzl.car.controller;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-
-import apx.com.amarsoft.als.currency.select.apzl.car.service.SelectCarAttributeService;
-import apx.com.amarsoft.als.currency.select.apzl.car.service.impl.SelectCarAttributeServiceImpl;
-
-import com.amarsoft.are.ARE;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.ReturnMapUtil;
-
-@Path("/select")
-public class SelectCarAttributeController {
-
-	SelectCarAttributeService service = new SelectCarAttributeServiceImpl();
-
-	/**
-	 * 车：品牌
-	 * 
-	 * @param request
-	 * @param sqlca
-	 * @param tx
-	 * @return
-	 * @throws Exception
-	 */
-	@Path("/product/model")
-	@POST
-	public Map<String, Object> selectProductModel(
-			@Context HttpServletRequest request, @Context Transaction sqlca,
-			@Context JBOTransaction tx) throws Exception {
-		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
-		ARE.getLog()
-				.info("[CONTROLLER] SelectCarAttributeController run .................");
-		ARE.getLog().info("[Path] /select/product/model run .................");
-		try {
-			return service
-					.selectProductModel(request, sqlca, tx, ReturnMapUtil);
-		} catch (Exception e) {
-			return ReturnMapUtil.rollback(e);
-		}
-	}
-
-	/**
-	 * 车：车系
-	 * 
-	 * @param request
-	 * @param sqlca
-	 * @param tx
-	 * @return
-	 * @throws Exception
-	 */
-	@Path("/car/series")
-	@POST
-	public Map<String, Object> selectCarSeries(
-			@Context HttpServletRequest request, @Context Transaction sqlca,
-			@Context JBOTransaction tx) throws Exception {
-		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
-		ARE.getLog()
-				.info("[CONTROLLER] SelectCarAttributeController run .................");
-		ARE.getLog().info("[Path] /select/car/series run .................");
-		try {
-			return service
-					.selectCarSeries(request, sqlca, tx, ReturnMapUtil);
-		} catch (Exception e) {
-			return ReturnMapUtil.rollback(e);
-		}
-	}
-
-	/**
-	 * 车：车型
-	 * 
-	 * @param request
-	 * @param sqlca
-	 * @param tx
-	 * @return
-	 * @throws Exception
-	 */
-	@Path("/car/system")
-	@POST
-	public Map<String, Object> selectCarSystem(
-			@Context HttpServletRequest request, @Context Transaction sqlca,
-			@Context JBOTransaction tx) throws Exception {
-		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
-		ARE.getLog()
-				.info("[CONTROLLER] SelectCarAttributeController run .................");
-		ARE.getLog().info("[Path] /select/car/system run .................");
-		try {
-			return service
-					.selectCarSystem(request, sqlca, tx, ReturnMapUtil);
-		} catch (Exception e) {
-			return ReturnMapUtil.rollback(e);
-		}
-	}
-}
+package apx.com.amarsoft.als.currency.select.apzl.car.controller;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+
+import apx.com.amarsoft.als.currency.select.apzl.car.service.SelectCarAttributeService;
+import apx.com.amarsoft.als.currency.select.apzl.car.service.impl.SelectCarAttributeServiceImpl;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.ReturnMapUtil;
+
+@Path("/select")
+public class SelectCarAttributeController {
+
+	SelectCarAttributeService service = new SelectCarAttributeServiceImpl();
+
+	/**
+	 * 车：品牌
+	 * 
+	 * @param request
+	 * @param sqlca
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	@Path("/product/model")
+	@POST
+	public Map<String, Object> selectProductModel(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog()
+				.info("[CONTROLLER] SelectCarAttributeController run .................");
+		ARE.getLog().info("[Path] /select/product/model run .................");
+		try {
+			return service
+					.selectProductModel(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+
+	/**
+	 * 车：车系
+	 * 
+	 * @param request
+	 * @param sqlca
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	@Path("/car/series")
+	@POST
+	public Map<String, Object> selectCarSeries(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog()
+				.info("[CONTROLLER] SelectCarAttributeController run .................");
+		ARE.getLog().info("[Path] /select/car/series run .................");
+		try {
+			return service
+					.selectCarSeries(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+
+	/**
+	 * 车：车型
+	 * 
+	 * @param request
+	 * @param sqlca
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	@Path("/car/system")
+	@POST
+	public Map<String, Object> selectCarSystem(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog()
+				.info("[CONTROLLER] SelectCarAttributeController run .................");
+		ARE.getLog().info("[Path] /select/car/system run .................");
+		try {
+			return service
+					.selectCarSystem(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+
+	/**
+	 * 产品名称
+	 * 
+	 * @param request
+	 * @param sqlca
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	@Path("/product/name")
+	@POST
+	public Map<String, Object> selectProductName(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog()
+				.info("[CONTROLLER] SelectCarAttributeController run .................");
+		ARE.getLog().info("[Path] /select/product/name run .................");
+		try {
+			return service
+					.selectProductName(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java
index 889aad369..7631333c4 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java
@@ -1,24 +1,28 @@
-package apx.com.amarsoft.als.currency.select.apzl.car.service;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.ReturnMapUtil;
-
-public interface SelectCarAttributeService {
-	Map<String, Object> selectProductModel(@Context HttpServletRequest request,
-			@Context Transaction sqlca, @Context JBOTransaction tx,
-			ReturnMapUtil ReturnMapUtil) throws Exception;
-
-	Map<String, Object> selectCarSeries(@Context HttpServletRequest request,
-			@Context Transaction sqlca, @Context JBOTransaction tx,
-			ReturnMapUtil ReturnMapUtil) throws Exception;
-
-	Map<String, Object> selectCarSystem(@Context HttpServletRequest request,
-			@Context Transaction sqlca, @Context JBOTransaction tx,
-			ReturnMapUtil ReturnMapUtil) throws Exception;
-}
+package apx.com.amarsoft.als.currency.select.apzl.car.service;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.ReturnMapUtil;
+
+public interface SelectCarAttributeService {
+	Map<String, Object> selectProductModel(@Context HttpServletRequest request,
+			@Context Transaction sqlca, @Context JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception;
+
+	Map<String, Object> selectCarSeries(@Context HttpServletRequest request,
+			@Context Transaction sqlca, @Context JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception;
+
+	Map<String, Object> selectCarSystem(@Context HttpServletRequest request,
+			@Context Transaction sqlca, @Context JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception;
+
+	Map<String, Object> selectProductName(@Context HttpServletRequest request,
+			@Context Transaction sqlca, @Context JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception;
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java
index 093d2eeba..9a54c30a2 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java
@@ -1,62 +1,79 @@
-package apx.com.amarsoft.als.currency.select.apzl.car.service.impl;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin;
-import apx.com.amarsoft.als.currency.select.apzl.car.service.SelectCarAttributeService;
-
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.amarsoft.context.ASUser;
-import com.base.constant.RestfullConstant;
-import com.base.util.ReturnMapUtil;
-
-public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{
-
-	public Map<String, Object> selectProductModel(HttpServletRequest request,
-			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil) throws Exception {
-			String sSelName = "SelectCardataBrand";
-			SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
-					request);
-			ASUser curUser = new ASUser((String) request.getSession().getAttribute(
-					"userid"), sqlca);
-			select.setParam("orgId", curUser.getOrgID());
-			Map<String, Object> body = select.execute(tx, sqlca, request);
-			ReturnMapUtil.setReturnMap(body,
-					(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
-			return ReturnMapUtil.getReturnMap();
-	}
-
-	public Map<String, Object> selectCarSeries(HttpServletRequest request,
-			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
-			throws Exception {
-		String sSelName = "SelectCardataSeries";
-		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
-				request);
-		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
-				"userid"), sqlca);
-		select.setParam("orgId", curUser.getOrgID());
-		Map<String, Object> body = select.execute(tx, sqlca, request);
-		ReturnMapUtil.setReturnMap(body,
-				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
-		return ReturnMapUtil.getReturnMap();
-	}
-
-	public Map<String, Object> selectCarSystem(HttpServletRequest request,
-			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
-			throws Exception {
-		String sSelName = "SelectCardataModel";
-		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
-				request);
-		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
-				"userid"), sqlca);
-		select.setParam("orgId", curUser.getOrgID());
-		Map<String, Object> body = select.execute(tx, sqlca, request);
-		ReturnMapUtil.setReturnMap(body,
-				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
-		return ReturnMapUtil.getReturnMap();
-	}
-
-}
+package apx.com.amarsoft.als.currency.select.apzl.car.service.impl;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin;
+import apx.com.amarsoft.als.currency.select.apzl.car.service.SelectCarAttributeService;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.base.constant.RestfullConstant;
+import com.base.util.MultipartDataUtil;
+import com.base.util.ReturnMapUtil;
+
+public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{
+
+	public Map<String, Object> selectProductModel(HttpServletRequest request,
+			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil) throws Exception {
+			String sSelName = "SelectCardataBrand";
+			SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+					request);
+			ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+					"userid"), sqlca);
+			select.setParam("orgId", curUser.getOrgID());
+			Map<String, Object> body = select.execute(tx, sqlca, request);
+			ReturnMapUtil.setReturnMap(body,
+					(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+			return ReturnMapUtil.getReturnMap();
+	}
+
+	public Map<String, Object> selectCarSeries(HttpServletRequest request,
+			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+			throws Exception {
+		String sSelName = "SelectCardataSeries";
+		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+				request);
+		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+				"userid"), sqlca);
+		select.setParam("orgId", curUser.getOrgID());
+		Map<String, Object> body = select.execute(tx, sqlca, request);
+		ReturnMapUtil.setReturnMap(body,
+				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+		return ReturnMapUtil.getReturnMap();
+	}
+
+	public Map<String, Object> selectCarSystem(HttpServletRequest request,
+			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+			throws Exception {
+		String sSelName = "SelectCardataModel";
+		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+				request);
+		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+				"userid"), sqlca);
+		select.setParam("orgId", curUser.getOrgID());
+		Map<String, Object> body = select.execute(tx, sqlca, request);
+		ReturnMapUtil.setReturnMap(body,
+				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+		return ReturnMapUtil.getReturnMap();
+	}
+
+	//获取产品名称
+	public Map<String, Object> selectProductName(HttpServletRequest request,
+			Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+			throws Exception {
+		String sSelName = "selectProductVersionInfo";
+		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+				request);
+		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+				"userid"), sqlca);
+		select.setParam("orgId", curUser.getOrgID());
+		Map<String, Object> body = select.execute(tx, sqlca, request);
+		ReturnMapUtil.setReturnMap(body,
+				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+		return ReturnMapUtil.getReturnMap();
+	}
+
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/controller/ContractSelectController.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/controller/ContractSelectController.java
index 4da4deeaf..50ac627f8 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/controller/ContractSelectController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/controller/ContractSelectController.java
@@ -1,39 +1,56 @@
-package apx.com.amarsoft.als.currency.select.contract.controller;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-
-import apx.com.amarsoft.als.currency.select.contract.service.ContractSelectService;
-import apx.com.amarsoft.als.currency.select.contract.service.impl.ContractSelectServiceImpl;
-
-import com.amarsoft.are.ARE;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.ReturnMapUtil;
-
-@Path("/select/detail")
-public class ContractSelectController {
-	ContractSelectService service = new ContractSelectServiceImpl();
-//	ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
-	// 客户变更申请 合同列表
-	@Path("/contract/customer/change/list")
-	@POST
-	public Map<String, Object> getLBContractCustomerList(
-			@Context HttpServletRequest request, @Context Transaction sqlca,
-			@Context JBOTransaction tx) throws Exception {
-		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
-		ARE.getLog().info(
-				"[CONTROLLER] ContractInfoListController run .................");
-		ARE.getLog().info(
-				"[Path] /select/detail/contract/customer/change/list run .................");
-		try {
-			return service.getLBContractCustomerList(request, sqlca, tx, ReturnMapUtil);
-		} catch (Exception e) {
-			return ReturnMapUtil.rollback(e);
-		}
-	}
-}
+package apx.com.amarsoft.als.currency.select.contract.controller;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+
+import apx.com.amarsoft.als.currency.select.contract.service.ContractSelectService;
+import apx.com.amarsoft.als.currency.select.contract.service.impl.ContractSelectServiceImpl;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.ReturnMapUtil;
+
+@Path("/select/detail")
+public class ContractSelectController {
+	ContractSelectService service = new ContractSelectServiceImpl();
+//	ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
+	// 客户变更申请 合同列表
+	@Path("/contract/customer/change/list")
+	@POST
+	public Map<String, Object> getLBContractCustomerList(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog().info(
+				"[CONTROLLER] ContractInfoListController run .................");
+		ARE.getLog().info(
+				"[Path] /select/detail/contract/customer/change/list run .................");
+		try {
+			return service.getLBContractCustomerList(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+	// 资料补充 合同列表
+	@Path("/contract/material/supply/list")
+	@POST
+	public Map<String, Object> getLBContractMaterialSupplyList(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx) throws Exception {
+		ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+		ARE.getLog().info(
+				"[CONTROLLER] ContractInfoListController run .................");
+		ARE.getLog().info(
+				"[Path] /select/detail/contract/customer/change/list run .................");
+		try {
+			return service.getLBContractMaterialSupplyList(request, sqlca, tx, ReturnMapUtil);
+		} catch (Exception e) {
+			return ReturnMapUtil.rollback(e);
+		}
+	}
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/ContractSelectService.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/ContractSelectService.java
index 0c6bcbaf8..86209996a 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/ContractSelectService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/ContractSelectService.java
@@ -1,17 +1,21 @@
-package apx.com.amarsoft.als.currency.select.contract.service;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.ReturnMapUtil;
-
-public interface ContractSelectService {
-	Map<String, Object> getLBContractCustomerList(
-			@Context HttpServletRequest request, @Context Transaction sqlca,
-			@Context JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
-			throws Exception;
-}
+package apx.com.amarsoft.als.currency.select.contract.service;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.ReturnMapUtil;
+
+public interface ContractSelectService {
+	Map<String, Object> getLBContractCustomerList(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+			throws Exception;
+	Map<String, Object> getLBContractMaterialSupplyList(
+			@Context HttpServletRequest request, @Context Transaction sqlca,
+			@Context JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+			throws Exception;
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/impl/ContractSelectServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/impl/ContractSelectServiceImpl.java
index 17f20a01d..d321386ab 100644
--- a/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/impl/ContractSelectServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/contract/service/impl/ContractSelectServiceImpl.java
@@ -1,33 +1,48 @@
-package apx.com.amarsoft.als.currency.select.contract.service.impl;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin;
-import apx.com.amarsoft.als.currency.select.contract.service.ContractSelectService;
-
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.util.Transaction;
-import com.amarsoft.context.ASUser;
-import com.base.constant.RestfullConstant;
-import com.base.util.ReturnMapUtil;
-
-public class ContractSelectServiceImpl implements ContractSelectService {
-	// ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
-
-	public Map<String, Object> getLBContractCustomerList(
-			HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
-			ReturnMapUtil ReturnMapUtil) throws Exception {
-		String sSelName = "SelectContractInfoCustChangeList";
-		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
-				request);
-		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
-				"userid"), sqlca);
-		select.setParam("orgId", curUser.getOrgID());
-		Map<String, Object> body = select.execute(tx, sqlca, request);
-		ReturnMapUtil.setReturnMap(body,
-				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
-		return ReturnMapUtil.getReturnMap();
-	}
-}
+package apx.com.amarsoft.als.currency.select.contract.service.impl;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin;
+import apx.com.amarsoft.als.currency.select.contract.service.ContractSelectService;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.base.constant.RestfullConstant;
+import com.base.util.ReturnMapUtil;
+
+public class ContractSelectServiceImpl implements ContractSelectService {
+	// ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
+
+	public Map<String, Object> getLBContractCustomerList(
+			HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception {
+		String sSelName = "SelectContractInfoCustChangeList";
+		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+				request);
+		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+				"userid"), sqlca);
+		select.setParam("orgId", curUser.getOrgID());
+		Map<String, Object> body = select.execute(tx, sqlca, request);
+		ReturnMapUtil.setReturnMap(body,
+				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+		return ReturnMapUtil.getReturnMap();
+	}
+
+	public Map<String, Object> getLBContractMaterialSupplyList(
+			HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
+			ReturnMapUtil ReturnMapUtil) throws Exception {
+		String sSelName = "SelectContractForSupport";
+		SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
+				request);
+		ASUser curUser = new ASUser((String) request.getSession().getAttribute(
+				"userid"), sqlca);
+		select.setParam("orgId", curUser.getOrgID());
+		Map<String, Object> body = select.execute(tx, sqlca, request);
+		ReturnMapUtil.setReturnMap(body,
+				(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
+		return ReturnMapUtil.getReturnMap();
+	}
+}