Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev

 Conflicts:
	src/main/webapp/HP/KC/HPKC005.jsp

src/main/java/com/baosight/hpjx/common/InventTypeEnun.java

@@ -15,7 +15,8 @@ public enum InventTypeEnun {
     MATERIAL(1,"原材料"),
     CONSUMABLE(2,"耗材"),
     SEMI_FINISHED_PRODUCT(3,"半成品"),
-    FINISHED_PRODUCT(4,"产成品");
+    FINISHED_PRODUCT(4,"产成品"),
+	WASTE(5,"废料");
 
     private Integer code;
 

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java

@@ -45,7 +45,7 @@ public class ServiceHPKC005 extends ServiceBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

 package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnun;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
-import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.AssertUtils;
@@ -25,15 +25,22 @@ import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
+ * 其他入库单
+ *
  * @author:songx
  * @date:,
  */
 public class ServiceHPKC006 extends ServiceBase {
 	
+	// 指定存货类型
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnun.MATERIAL.getCode(),
+			InventTypeEnun.CONSUMABLE.getCode(), InventTypeEnun.WASTE.getCode()};
+	
 	/**
 	 * 画面初始化
 	 *
@@ -42,10 +49,12 @@ public class ServiceHPKC006 extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
+			Map queryMap = new HashMap();
+			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -66,6 +75,7 @@ public class ServiceHPKC006 extends ServiceBase {
 			String receiptDate = MapUtils.getString(queryRow, "receiptDate");
 			queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
 					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
+			queryRow.put("inventTypes", DEFAULT_INVENT_CODE);
 			inInfo = super.query(inInfo, HPKC006.QUERY, new HPKC006());
 			List sum = dao.query(HPSqlConstant.HPKC006.QUERY_SUM, queryRow);
 			inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java

 package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnun;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
-import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
@@ -16,18 +16,16 @@ import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.ObjectUtils;
 import com.baosight.hpjx.util.StringUtil;
-import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
-
 import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +37,10 @@ import java.util.Map;
  */
 public class ServiceHPKC007 extends ServiceBase {
 	
+	// 指定存货类型
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnun.MATERIAL.getCode(),
+			InventTypeEnun.CONSUMABLE.getCode(), InventTypeEnun.WASTE.getCode()};
+	
 	/**
 	 * 画面初始化
 	 *
@@ -47,10 +49,12 @@ public class ServiceHPKC007 extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
+			Map queryMap = new HashMap();
+			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007A.java

 package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnun;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC007;
@@ -16,16 +17,14 @@ import com.baosight.hpjx.util.MapUtils;
 import com.baosight.hpjx.util.ObjectUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
-import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
-import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 其他出库单挑选库存
@@ -35,6 +34,10 @@ import java.util.stream.Collectors;
  */
 public class ServiceHPKC007A extends ServiceEPBase {
 	
+	// 指定存货类型
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnun.MATERIAL.getCode(),
+			InventTypeEnun.CONSUMABLE.getCode(), InventTypeEnun.WASTE.getCode()};
+	
 	/**
 	 * 初始化
 	 *
@@ -44,10 +47,12 @@ public class ServiceHPKC007A extends ServiceEPBase {
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
+			Map queryMap = new HashMap();
+			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -65,6 +70,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			queryRow.put("inventTypes", DEFAULT_INVENT_CODE);
 			inInfo = super.query(inInfo, HPKC010.QUERY, new HPKC010());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010.java

@@ -101,8 +101,8 @@ public class ServiceHPKC010 extends ServiceBase {
 			}});
 			if(CollectionUtils.isEmpty(list)){
 				//新增
-				if(Objects.isNull(amount)||amount.compareTo(BigDecimal.ZERO)<=0
-						||Objects.isNull(amount)||weight.compareTo(BigDecimal.ZERO)<=0){
+				if(amount.compareTo(BigDecimal.ZERO)<0
+						||weight.compareTo(BigDecimal.ZERO)<0){
 					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
 				}
 				generatorBaseInfo(newObj);
@@ -113,7 +113,7 @@ public class ServiceHPKC010 extends ServiceBase {
 				oldObj.fromMap(list.get(0));
 				BigDecimal afterAmout = oldObj.getAmount().add(amount);
 				BigDecimal afterWeight = oldObj.getWeight().add(weight);
-				if(afterAmout.compareTo(BigDecimal.ZERO)<=0||afterWeight.compareTo(BigDecimal.ZERO)<=0){
+				if(afterAmout.compareTo(BigDecimal.ZERO)<0||afterWeight.compareTo(BigDecimal.ZERO)<0){
 					throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存！");
 				}
 				oldObj.setAmount(afterAmout);
@@ -220,11 +220,13 @@ public class ServiceHPKC010 extends ServiceBase {
 		if(Objects.isNull(inventRecordId)||inventRecordId==0){
 			throw new PlatException("存货档案ID不能为空！");
 		}
-		if(Objects.isNull(amout)||amout.compareTo(BigDecimal.ZERO)==0){
-			throw new PlatException("库存变更数量不能为空！");
+		if(Objects.isNull(amout)||
+				Objects.isNull(amout)){
+			throw new PlatException("库存变更数量或重量不能为空！");
 		}
-		if(Objects.isNull(amout)||weight.compareTo(BigDecimal.ZERO)==0){
-			throw new PlatException("库存变更重量不能为空！");
+		if(amout.compareTo(BigDecimal.ZERO)==0
+				&&weight.compareTo(BigDecimal.ZERO)==0){
+			throw new PlatException("库存变更数量或重量不能为0)！");
 		}
 	}
 	

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -68,6 +68,9 @@
         <isNotEmpty prepend=" AND " property="otherEnterNos">
             OTHER_ENTER_NO IN <iterate close=")" open="(" conjunction="," property="otherEnterNos">#otherEnterNos[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="spec">
             <isEqual property="spec" compareValue="无规格">
                 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC010.xml

@@ -67,6 +67,9 @@
         <isNotEmpty prepend=" AND " property="ids">
             ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="spec">
             <isEqual property="spec" compareValue="无规格">
                 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java

@@ -9,11 +9,11 @@ import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.ObjectUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
-
 import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
@@ -180,8 +180,10 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @return
 	 */
 	public EiInfo queryMaterialComboBox(EiInfo eiInfo) {
-		Map map = new HashMap();
-		map.put("inventType", eiInfo.getString("inventType"));
+		Map map = EiInfoUtils.getFirstRow(eiInfo);
+		if (ObjectUtils.isEmpty(map.get("inventType"))) {
+			map.put("inventType", eiInfo.getString("inventType"));
+		}
 		List<DdynamicEnum> list = new ArrayList<>();
 		list.add(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID);
 		CommonMethod.initBlock(eiInfo, list, map);

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java

@@ -5,6 +5,7 @@ import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.pz.domain.HPPZ007;
 import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -137,14 +138,18 @@ public class ServiceHPPZ007 extends ServiceBase {
 		inInfo.set("list", query);
 		return inInfo;
 	}
-
-	public EiInfo queryComboBox(EiInfo eiInfo) {
-		Map map = new HashMap();
-		map.put("whType", eiInfo.getString("whType"));
+	
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo queryComboBox(EiInfo inInfo) {
 		List<DdynamicEnum> list = new ArrayList<>();
 		list.add(DdynamicEnum.WH_RECORD_BLOCK_ID);
-		CommonMethod.initBlock(eiInfo, list, map);
-		return eiInfo;
+		CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo));
+		return inInfo;
 	}
-
+	
 }

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml

@@ -44,6 +44,9 @@
     </sql>
 
     <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventCodes">
             INVENT_CODE IN <iterate close=")" open="(" conjunction="," property="inventCodes">#inventCodes[]#</iterate>
         </isNotEmpty>
@@ -109,7 +112,7 @@
         WHERE ID = #id#
 	</update>
 
-    <!-- -->
+    <!-- 存货名称 -->
 	<select id="queryComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT DISTINCT
 		INVENT_CODE as "inventCode",
@@ -117,15 +120,8 @@
 		FROM hpjx.t_hppz004
         WHERE DELETE_FLAG = 0
         AND STATUS = 1
-		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventCode">
-			INVENT_CODE = #inventCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventType">
-			INVENT_TYPE = #inventType#
-		</isNotEmpty>
+        <include refid="condition"/>
+        <include refid="customCondition"/>
 		ORDER BY INVENT_CODE
 	</select>
 

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml

@@ -53,6 +53,12 @@
         </isNotNull>
     </sql>
 
+    <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
+    </sql>
+
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="orderBy">
@@ -64,17 +70,19 @@
         </dynamic>
     </sql>
 
-	<select id="query" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ006">
-		SELECT
-            <include refid="column"/>
-		FROM hpjx.t_hppz006 WHERE 1=1
-		<include refid="condition"/>
+    <select id="query" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ006">
+        SELECT
+        <include refid="column"/>
+        FROM hpjx.t_hppz006 WHERE 1=1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
         <include refid="order"/>
-	</select>
+    </select>
 
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM hpjx.t_hppz006 WHERE 1=1
 		<include refid="condition"/>
+        <include refid="customCondition"/>
 	</select>
 
 	<insert id="insert">
@@ -129,17 +137,14 @@
 		    ID as "id",
 		    CONCAT(INVENT_CODE,'-',INVENT_NAME,'[',SPEC,']') as "inventName"
 		FROM hpjx.t_hppz006
-        WHERE DELETE_FLAG = 1
+        WHERE DELETE_FLAG = 0
         AND STATUS=1
-		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventType">
-			INVENT_TYPE = #inventType#
-		</isNotEmpty>
+        <include refid="condition"/>
+        <include refid="customCondition"/>
 		ORDER BY INVENT_CODE
 	</select>
 
+    <!-- 存货名称 -->
 	<select id="queryMaterialComboBox" parameterClass="java.util.HashMap"
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
@@ -147,13 +152,9 @@
 		INVENT_NAME as "inventName"
 		FROM hpjx.t_hppz006
         WHERE DELETE_FLAG = 0
-        AND STATUS=1
-		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventType">
-			INVENT_TYPE = #inventType#
-		</isNotEmpty>
+        AND STATUS = 1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
 		ORDER BY INVENT_CODE
 	</select>
 
@@ -164,16 +165,9 @@
             (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
         FROM hpjx.t_hppz006
         WHERE DELETE_FLAG = 0
-        AND STATUS=1
-        <isNotEmpty prepend=" AND " property="companyCode">
-            COMPANY_CODE = #companyCode#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="inventCode">
-            INVENT_CODE = #inventCode#
-        </isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventType">
-			INVENT_TYPE = #inventType#
-		</isNotEmpty>
+        AND STATUS = 1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
         ORDER BY ID
     </select>
 
@@ -183,16 +177,9 @@
         (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
         FROM hpjx.t_hppz006
         WHERE DELETE_FLAG = 0
-        AND STATUS=1
-        <isNotEmpty prepend=" AND " property="companyCode">
-            COMPANY_CODE = #companyCode#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="inventCode">
-            INVENT_CODE = #inventCode#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="inventType">
-            INVENT_TYPE = #inventType#
-        </isNotEmpty>
+        AND STATUS = 1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
         ORDER BY SPEC DESC
     </select>
 
@@ -203,16 +190,11 @@
         (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec",
         MATERIAL AS "material" ,  <!-- 材质 -->
         UNIT AS "unit"   <!-- 单位 -->
-        FROM hpjx.t_hppz006 WHERE STATUS=1
-        <isNotEmpty prepend=" AND " property="companyCode">
-            COMPANY_CODE = #companyCode#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="inventCode">
-            INVENT_CODE = #inventCode#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="inventType">
-            INVENT_TYPE = #inventType#
-        </isNotEmpty>
+        FROM hpjx.t_hppz006
+        WHERE DELETE_FLAG = 0
+        AND STATUS = 1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
         ORDER BY ID
     </select>
 

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ007.xml

@@ -48,6 +48,9 @@
     </sql>
 
     <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            WH_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="whCodes">
             WH_CODE IN <iterate close=")" open="(" conjunction="," property="whCodes">#whCodes[]#</iterate>
         </isNotEmpty>
@@ -115,26 +118,23 @@
         WHERE ID = #id#
 	</update>
 
-	<select id="queryComboBox" parameterClass="java.util.HashMap"
-			resultClass="java.util.HashMap">
-		SELECT DISTINCT
-		WH_CODE	as "whCode",  <!-- 仓库编码 -->
-		WH_NAME	as "whName"  <!-- 仓库名称 -->
-		FROM hpjx.t_hppz007
+    <!-- 仓库名称下拉框 -->
+	<select id="queryComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+        SELECT DISTINCT
+        WH_CODE as "whCode",  <!-- 仓库编码 -->
+        WH_NAME as "whName"  <!-- 仓库名称 -->
+        FROM hpjx.t_hppz007
         WHERE DELETE_FLAG = 0
-        AND STATUS=1
-		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="whType">
-			WH_TYPE = #whType#
-		</isNotEmpty>
-		ORDER BY WH_CODE
+        AND STATUS = 1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
+        ORDER BY WH_CODE
 	</select>
 
+    <!-- 根据编码查名称 -->
 	<select id="queryByWhCode" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ007">
-		SELECT WH_NAME	as "whName"
-		FROM hpjx.t_hppz007
+        SELECT WH_NAME as "whName"
+        FROM hpjx.t_hppz007
         WHERE DELETE_FLAG = 0
         AND WH_CODE = #whCode#
 	</select>

src/main/webapp/HP/KC/HPKC005.js

-var inventNameGlobalData = [];
-var specGlobalData = [];
+let whNameGlobalData = [];
+let inventNameGlobalData = [];
+let specGlobalData = [];
 $(function() {
 
     IPLATUI.EFGrid = {
@@ -9,6 +10,25 @@ $(function() {
 		},
         "result": {
 	        columns: [{
+		        field: "whCode",
+		        template: function (dataItem) {
+			        for (let i = 0; i < whNameGlobalData.length; i++) {
+				        if (whNameGlobalData[i]['valueField'] === dataItem['whCode']) {
+					        return whNameGlobalData[i]['textField'];
+				        }
+			        }
+			        return "";
+		        },
+		        editor: function (container, options) {
+			        let inInfo = new EiInfo();
+			        inInfo.set("inqu_status-0-whType", options.model["inventType"]);
+			        inInfo.set("serviceName", "HPPZ007");
+			        inInfo.set("methodName", "queryComboBox");
+			        inInfo.set("blockId", "wh_record_block_id");
+			        inInfo.set("field", options.field);
+			        refreshSelect(container, inInfo);
+		        }
+	        }, {
 		        field: "inventCode",
 		        template: function (dataItem) {
 			        for (let i = 0; i < inventNameGlobalData.length; i++) {
@@ -20,11 +40,11 @@ $(function() {
 		        },
 		        editor: function (container, options) {
 			        let inInfo = new EiInfo();
+			        inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
 			        inInfo.set("serviceName", "HPPZ006");
 			        inInfo.set("methodName", "queryMaterialComboBox");
 			        inInfo.set("blockId", "material_record_block_id");
 			        inInfo.set("field", options.field);
-			        inInfo.set("inventType", options.model["inventType"]);
 			        refreshSelect(container, inInfo);
 		        }
 	        }, {
@@ -39,11 +59,11 @@ $(function() {
 		        },
 		        editor: function (container, options) {
 			        let inInfo = new EiInfo();
+			        inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
 			        inInfo.set("serviceName", "HPPZ006");
 			        inInfo.set("methodName", "queryComboBoxSpec");
 			        inInfo.set("blockId", "invent_spec_block_id");
 			        inInfo.set("field", options.field);
-			        inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
 			        refreshSelect(container, inInfo);
 		        }
 	        }, {
@@ -68,9 +88,17 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
+	let inInfo = new EiInfo();
+	// 仓库名称
+	EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
+		onSuccess: function (ei) {
+			whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
 	// 存货名称
-	let eiInfo = new EiInfo();
-	EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+	EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
 			inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
 		},
@@ -78,7 +106,7 @@ $(window).load(function () {
 		}
 	}, {async: false});
 	// 规格
-	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
+	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", inInfo, {
 		onSuccess: function (ei) {
 			specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
 		},

src/main/webapp/HP/KC/HPKC005.jsp

@@ -8,23 +8,24 @@
 <EF:EFPage title="库存盘点单">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期" colWidth="3"
+			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+			<EF:EFInput cname="盘点单号" ename="inqu_status-0-checkNo" colWidth="3"/>
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="3" filter="contains">
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-inventCode" cname="存货名称" colWidth="3" filter="contains" defultValue="">
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>
 		<div class="row">
-			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
+			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
@@ -35,32 +36,27 @@
 	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 		    <EF:EFColumn ename="checkNo" cname="盘点单号" enable="false" width="140" align="center"/>
-		    <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
-		                 parseFormats="['yyyyMMdd']" width="90" align="center" readonly="true"/>
-		    <EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
-		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
-		                      textField="textField" valueField="valueField"
-		                      align="center" filter="contains" readonly="true">
-		    </EF:EFComboColumn>
-		    <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center"
-		                      readonly="true">
+		    <EF:EFColumn ename="receiptDate" cname="单据日期" width="90" align="center" editType="date"
+		                 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+		    <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true">
 			    <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 		    </EF:EFComboColumn>
-		    <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" readonly="true"/>
-		    <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" readonly="true"/>
+		    <EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
+		    <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
+		    <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
 		    <EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right"
-		                 sumType="all" readonly="true"/>
+		                 sumType="all" required="true" readonly="true"/>
 		    <EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right"
-		                 sumType="all" readonly="true"/>
+		                 sumType="all" required="true" readonly="true"/>
 		    <EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right"
-		                 sumType="all" readonly="true"/>
+		                 sumType="all" required="true" readonly="true"/>
 		    <EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right"
-		                 sumType="all" readonly="true"/>
+		                 sumType="all" required="true" readonly="true"/>
 		    <EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100"
-		                 align="right" sumType="all" required="true" readonly="true"/>
+		                 align="right" sumType="all" readonly="true"/>
 		    <EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100"
-		                 align="right" sumType="all" required="true" readonly="true"/>
-		    <EF:EFColumn ename="notes" cname="备注" width="100" readonly="true"/>
+		                 align="right" sumType="all" readonly="true"/>
+		    <EF:EFColumn ename="notes" cname="备注" width="150" readonly="true"/>
 		    <EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 		    <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
 		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

src/main/webapp/HP/KC/HPKC005A.jsp

@@ -10,21 +10,20 @@
 		<div class="row">
 			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFInput cname="入库单号" ename="inqu_status-0-otherEnterNo" colWidth="3"/>
-			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
 			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
-		</div>
-		<div class="row">
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+		</div>
+		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
@@ -35,23 +34,20 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="wh_record_block_id"
-			                  textField="textField" valueField="valueField">
-			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="invent_name_block_id"
-			                  textField="textField" valueField="valueField">
+			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="invent_spec_block_id"
-			                  textField="textField" valueField="valueField">
+			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="entityAmount" cname="实物数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="entityWeight" cname="实物重量" width="120" align="right" format="{0:N3}" required="true"/>

src/main/webapp/HP/KC/HPKC006.js

-var inventNameGlobalData = [];
-var specGlobalData = [];
+let whNameGlobalData = [];
+let inventNameGlobalData = [];
+let specGlobalData = [];
 $(function() {
 
 	IPLATUI.EFGrid = {
@@ -9,6 +10,26 @@ $(function() {
 		},
 		"result": {
 			columns: [{
+				field: "whCode",
+				template: function (dataItem) {
+					for (let i = 0; i < whNameGlobalData.length; i++) {
+						if (whNameGlobalData[i]['valueField'] === dataItem['whCode']) {
+							return whNameGlobalData[i]['textField'];
+						}
+					}
+					return "";
+				},
+				editor: function (container, options) {
+					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+					inInfo.set("inqu_status-0-whType", options.model["inventType"]);
+					inInfo.set("serviceName", "HPPZ007");
+					inInfo.set("methodName", "queryComboBox");
+					inInfo.set("blockId", "wh_record_block_id");
+					inInfo.set("field", options.field);
+					refreshSelect(container, inInfo);
+				}
+			}, {
 				field: "inventCode",
 				template: function (dataItem) {
 					for (let i = 0; i < inventNameGlobalData.length; i++) {
@@ -20,7 +41,8 @@ $(function() {
 				},
 				editor: function (container, options) {
 					let inInfo = new EiInfo();
-					inInfo.set("inventType", options.model["inventType"]);
+					inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+					inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
 					inInfo.set("serviceName", "HPPZ006");
 					inInfo.set("methodName", "queryMaterialComboBox");
 					inInfo.set("blockId", "material_record_block_id");
@@ -39,6 +61,7 @@ $(function() {
 				},
 				editor: function (container, options) {
 					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
 					inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
 					inInfo.set("serviceName", "HPPZ006");
 					inInfo.set("methodName", "queryComboBoxSpec");
@@ -63,9 +86,18 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
+	// 仓库名称
+	let inInfo = new EiInfo();
+	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+	EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
+		onSuccess: function (ei) {
+			whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
 	// 存货名称
-	let eiInfo = new EiInfo();
-	EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+	EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
 			inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
 		},
@@ -73,7 +105,7 @@ $(window).load(function () {
 		}
 	}, {async: false});
 	// 规格
-	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
+	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", inInfo, {
 		onSuccess: function (ei) {
 			specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
 		},

src/main/webapp/HP/KC/HPKC006.jsp

@@ -11,21 +11,21 @@
 			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="入库单号" ename="inqu_status-0-otherEnterNo" colWidth="3"/>
-			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>
 		<div class="row">
-			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
+			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
@@ -38,15 +38,11 @@
 			<EF:EFColumn ename="otherEnterNo" cname="入库单号" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
 			             parseFormats="['yyyyMMdd']" width="90" align="center" required="true" readonly="true"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
-			                  itemTemplate="#=textField#" blockName="wh_record_block_id"
-			                  textField="textField" valueField="valueField"
-			                  align="center" filter="contains" required="true" readonly="true">
-			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
 			                  readonly="true">
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="100" align="right"

src/main/webapp/HP/KC/HPKC007.js

-var inventNameGlobalData = [];
-var specGlobalData = [];
 $(function() {
 
 	IPLATUI.EFGrid = {
@@ -9,53 +7,10 @@ $(function() {
 		},
 		"result": {
 			columns: [{
-				field: "inventCode",
-				template: function (dataItem) {
-					for (let i = 0; i < inventNameGlobalData.length; i++) {
-						if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
-							return inventNameGlobalData[i]['textField'];
-						}
-					}
-					return "";
-				},
-				editor: function (container, options) {
-					let inInfo = new EiInfo();
-					inInfo.set("inventType", options.model["inventType"]);
-					inInfo.set("serviceName", "HPPZ006");
-					inInfo.set("methodName", "queryMaterialComboBox");
-					inInfo.set("blockId", "material_record_block_id");
-					inInfo.set("field", options.field);
-					refreshSelect(container, inInfo);
-				}
-			}, {
-				field: "inventRecordId",
-				template: function (dataItem) {
-					for (let i = 0; i < specGlobalData.length; i++) {
-						if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-							return specGlobalData[i]['textField'];
-						}
-					}
-					return "";
-				},
-				editor: function (container, options) {
-					let inInfo = new EiInfo();
-					inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
-					inInfo.set("serviceName", "HPPZ006");
-					inInfo.set("methodName", "queryComboBoxSpec");
-					inInfo.set("blockId", "invent_spec_block_id");
-					inInfo.set("field", options.field);
-					refreshSelect(container, inInfo);
-				}
-			}, {
 				field: "createdName",
 				template: function (options) {
 					return showUserName(options.createdBy, options.createdName);
 				}
-			}, {
-				field: "updatedName",
-				template: function (options) {
-					return showUserName(options.updatedBy, options.updatedName);
-				}
 			}],
 			loadComplete: function (grid) {
 			}
@@ -74,23 +29,6 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
-	// 存货名称
-	let eiInfo = new EiInfo();
-	EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
-		onSuccess: function (ei) {
-			inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
-		},
-		onFail: function (ei) {
-		}
-	}, {async: false});
-	// 规格
-	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
-		onSuccess: function (ei) {
-			specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
-		},
-		onFail: function (ei) {
-		}
-	}, {async: false});
 	// 查询
 	query();
 });

src/main/webapp/HP/KC/HPKC007.jsp

@@ -11,52 +11,56 @@
 		    <EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
 		                     role="date" format="yyyy-MM-dd" readonly="true"/>
 		    <EF:EFInput cname="出库单号" ename="inqu_status-0-otherOuterNo" colWidth="3"/>
-		    <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+		    <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 			    <EF:EFOption label="全部" value=""/>
-			    <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			    <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
 		    </EF:EFSelect>
-		    <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+		    <EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
 			    <EF:EFOption label="全部" value=""/>
-			    <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+			    <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
 	    </div>
 	    <div class="row">
-		    <EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
+		    <EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
-		    <EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
+		    <EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
 	    </div>
     </EF:EFRegion>
 
-    <EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="no">
-	        <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-	        <EF:EFColumn ename="otherOuterNo" cname="出库单号" enable="false" width="130" align="center"/>
-	        <EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" editType="date" dateFormat="yyyy-MM-dd"
-	                     parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
-	        <EF:EFComboColumn ename="whCode" cname="仓库编码" enable="false" width="120"
-	                          columnTemplate="#=textField#" itemTemplate="#=textField#"
-	                          blockName="wh_record_block_id"
-	                          textField="textField" valueField="valueField"
-	                          align="center" filter="contains">
-	        </EF:EFComboColumn>
-	        <EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
-		        <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
-	        </EF:EFComboColumn>
-	        <EF:EFColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"/>
-	        <EF:EFColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"/>
-	        <EF:EFColumn ename="amount" cname="数量" enable="false" format="{0:N3}" maxLength="20" width="100"
-	                     align="right" sumType="all" required="true"/>
-	        <EF:EFColumn ename="weight" cname="重量" enable="false" format="{0:N3}" maxLength="20" width="100"
-	                     align="right" sumType="all" required="true"/>
-	        <EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
-	        <EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
-	        <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
-	                     editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
-        </EF:EFGrid>
-    </EF:EFRegion>
+	<EF:EFRegion id="result" title="记录集">
+		<EF:EFGrid blockId="result" autoDraw="no">
+			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="otherOuterNo" cname="出库单号" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" editType="date" dateFormat="yyyy-MM-dd"
+			             parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
+			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
+			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="amount" cname="数量" enable="false" format="{0:N3}" maxLength="20" width="100"
+			             align="right" sumType="all" required="true"/>
+			<EF:EFColumn ename="weight" cname="重量" enable="false" format="{0:N3}" maxLength="20" width="100"
+			             align="right" sumType="all" required="true"/>
+			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
+			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HP/KC/HPKC007A.jsp

@@ -10,21 +10,20 @@
 		<div class="row">
 			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFInput cname="入库单号" ename="inqu_status-0-otherEnterNo" colWidth="3"/>
-			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-		</div>
-		<div class="row">
 			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+		</div>
+		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
@@ -35,23 +34,20 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="wh_record_block_id"
-			                  textField="textField" valueField="valueField">
-			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="invent_name_block_id"
-			                  textField="textField" valueField="valueField">
+			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  blockName="invent_spec_block_id"
-			                  textField="textField" valueField="valueField">
+			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="applyAmount" cname="申请数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="applyWeight" cname="申请重量" width="120" align="right" format="{0:N3}" required="true"/>

src/main/webapp/HP/KC/HPKC099.jsp

@@ -20,7 +20,7 @@
             <EF:EFInput blockId="inqu_status" ename="projType" cname="生产订单号:" row="0"/>
             <EF:EFInput blockId="inqu_status" ename="projType" cname="生产组:" row="0"/>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">

src/main/webapp/HP/PZ/HPPZ007.jsp

@@ -11,7 +11,7 @@
 			<EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/>
 			<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hppz.whType"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="状态:" blockId="inqu_status" ename="status" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
@@ -26,7 +26,7 @@
 			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
 			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true">
-				<EF:EFCodeOption codeName="hpjx.hppz.whType"/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="princ" cname="负责人" width="120" align="center" required="true"
 			                  blockName="user_block_id" textField="textField" valueField="valueField"

src/main/webapp/HP/PZ/HPPZ008.jsp

@@ -16,7 +16,7 @@
             <EF:EFInput blockId="inqu_status" ename="whType" cname="仓库类型:" row="0"/>
 
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">

src/main/webapp/HP/SC/HPSC001.jsp

@@ -13,7 +13,7 @@
 
         <div class="row">
             <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
-                         template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
+                         template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFSelect>
@@ -23,14 +23,14 @@
                 <EF:EFOption label="已审核" value="1"/>
             </EF:EFSelect>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFComboColumn ename="projType" cname="项目类型" width="100" align="center" required="true"
-                              columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
+                              columnTemplate="#=textField#" itemTemplate="#=textField#">
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="projCode" enable="false" cname="项目编码"/>

src/main/webapp/HP/SC/HPSC002.jsp

@@ -18,7 +18,7 @@
             </EF:EFSelect>
         </div>
         <EF:EFInput ename="parentPrdtCode" blockId="inqu_status" hidden="true"/>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
     <div id="splitter" class="i-fit-height" style="display: inline">
         <div id="left-pane" class="i-fit-height" style="width: 20%;float:left;">

src/main/webapp/HP/SC/HPSC003.jsp

@@ -21,7 +21,7 @@
                 <EF:EFOption label="已审核" value="1"/>
             </EF:EFSelect>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="基本信息">

src/main/webapp/HP/SC/HPSC005.jsp

@@ -24,7 +24,7 @@
                 <EF:EFOption label="已派工" value="1"/>
             </EF:EFSelect>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">

src/main/webapp/HP/SC/HPSC011.jsp

@@ -16,16 +16,23 @@
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
-            <EF:EFInput blockId="inqu_status" ename="projType" cname="项目类型:" row="0"/>
+            <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
+                         template="#=textField#" valueTemplate="#=textField#">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
+            </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn ename="projType"  enable="false" cname="项目类型"/>
+            <EF:EFComboColumn ename="projType" cname="项目类型" width="100" align="center" required="true"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#">
+                <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
+            </EF:EFComboColumn>
             <EF:EFColumn enable="false"  ename="projCode" cname="项目编码"/>
             <EF:EFColumn enable="false"  ename="projName" cname="项目名称"/>
             <EF:EFColumn enable="false"  ename="princ1" cname="本公司项目负责人"/>

src/main/webapp/HP/SC/HPSC098.jsp

@@ -10,7 +10,7 @@
         <div class="row">
             <EF:EFInput ename="orgCname" cname="组织名称" blockId="inqu_status" row="0"/>
         </div>
-        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="明细信息">