Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -28,25 +28,27 @@ public enum DdynamicEnum {
      * 用途：项目性质下拉框
      * 编写：wwl
      */
-    PROJ_TYPE_BLOCK_ID("proj_type_block_id","natCode","natName","HGPZ008.queryComboBox"),
-
-    /**
-     * 模块：客户类型
-     * 用途：客户类型下拉框
-     * 编写：
-     */
-    CUSTOMER_TYPE_BLOCK_ID("customer_type_block_id","custType","custTypeName","HGPZ001.queryComboBox"),
-    /** TODO
-     * 模块：客户档案
-     * 用途：客户档案下拉框
-     * 编写：wwl
-     */
-    CUSTOMER_RECORD_BLOCK_ID("customer_record_block_id","custCode","custName","HGPZ002.queryComboBox"),
-
-    /**
-     * 模块：供应商档案
-     * 用途：供应商档案下拉框
-     * 编写：
+    PROJ_TYPE_BLOCK_ID("proj_type_block_id", "natCode", "natName", "HGPZ008.queryComboBox"),
+	
+	/**
+	 * 模块：客户类型
+	 * 用途：客户类型下拉框
+	 * 编写：
+	 */
+	CUSTOMER_TYPE_BLOCK_ID("customer_type_block_id", "custType", "custTypeName", "HGPZ001.queryComboBox"),
+	
+	/**
+	 * TODO
+	 * 模块：客户档案
+	 * 用途：客户档案下拉框
+	 * 编写：wwl
+	 */
+	CUSTOMER_RECORD_BLOCK_ID("customer_record_block_id", "custCode", "custName", "HGPZ002.queryComboBox"),
+	
+	/**
+	 * 模块：供应商档案
+	 * 用途：供应商档案下拉框
+	 * 编写：
      */
     SUP_RECORD_BLOCK_ID("sup_record_block_id","supCode","supName","HGPZ003.queryComboBox"),
 
@@ -72,29 +74,45 @@ public enum DdynamicEnum {
     INVENT_RECORD_BLOCK_ID("invent_record_block_id","inventCode","inventName","HGPZ005.queryComboBox"),
 
     /**
-     * 模块：仓库类型
-     * 用途：仓库类型下拉框
+     * 模块：存货档案（ALL）
+     * 用途：存货档案下拉框
      * 编写：
      */
-    WH_TYPE_BLOCK_ID("wh_type_block_id","whType","whTypeName","HGPZ006.queryComboBox"),
-
-    /**
-     * 模块：仓库档案
-     * 用途：仓库档案下拉框
+    INVENT_ALL_BLOCK_ID("invent_all_block_id", "id", "spec", "material", "unit", "length", "width", "thick",
+            "coefficient", "HGPZ005.queryComboBoxAll"),
+	
+	/**
+	 * 模块：规格（无ID）
+	 * 用途：存货档案下拉框
+	 * 编写：
+	 */
+	SPEC_NAME_BLOCK_ID("spec_name_block_id", "spec", "spec", "HGPZ005.queryComboBoxSpecName"),
+	
+	/**
+     * 模块：仓库类型
+     * 用途：仓库类型下拉框
      * 编写：
      */
-    WH_RECORD_BLOCK_ID("wh_record_block_id","whCode","whName","HGPZ007.queryComboBox"),
-    /**
-     * 模块：厂区管理
-     * 用途：厂区管理下拉框
-     * 编写：songx
-     */
-    FACTORY_RECORD_BLOCK_ID("factory_record_block_id","orgId","orgCname","HPXSOrg.queryFactoryComboBox"),
-
-
-    /**
-     * 模块：组管理
-     * 用途：组管理下拉框
+    WH_TYPE_BLOCK_ID("wh_type_block_id", "whType", "whTypeName", "HGPZ006.queryComboBox"),
+	
+	/**
+	 * 模块：仓库档案
+	 * 用途：仓库档案下拉框
+	 * 编写：
+	 */
+	WH_RECORD_BLOCK_ID("wh_record_block_id", "whCode", "whName", "HGPZ007.queryComboBox"),
+	
+	/**
+	 * 模块：厂区管理
+	 * 用途：厂区管理下拉框
+	 * 编写：songx
+	 */
+	FACTORY_RECORD_BLOCK_ID("factory_record_block_id", "orgId", "orgCname", "HPXSOrg.queryFactoryComboBox"),
+	
+	
+	/**
+	 * 模块：组管理
+	 * 用途：组管理下拉框
      * 编写：songx
      */
     GROUP_RECORD_BLOCK_ID("group_record_block_id","orgId","orgCname","HPXSOrg.queryGroupComboBox"),

src/main/java/com/baosight/hggp/core/dao/BaseCondition.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<sqlMap namespace="BaseCondition">
+
+    <!-- 规格 -->
+    <sql id="specCondition">
+        <isNotEmpty prepend=" AND " property="spec">
+            <isEqual property="spec" compareValue="无规格">
+                SPEC_ID IN (SELECT ID FROM ${metaSchema}.HGPZ005 WHERE SPEC = '')
+            </isEqual>
+            <isNotEqual property="spec" compareValue="无规格">
+                SPEC_ID IN (SELECT ID FROM ${metaSchema}.HGPZ005 WHERE SPEC = #spec#)
+            </isNotEqual>
+        </isNotEmpty>
+    </sql>
+
+</sqlMap>

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001.java

@@ -39,9 +39,12 @@ public class HGCG001 extends DaoEPBase {
 	public static final String FIELD_PLAN_NO = "planNo";    		/* 计划单号*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
+	public static final String FIELD_SPEC_ID = "specId";    		/* 规格ID*/
 	public static final String FIELD_SPEC = "spec";    		/* 规格*/
 	public static final String FIELD_MATERIAL = "material";    		/* 材质*/
 	public static final String FIELD_LENGTH = "length";    		/* 长度*/
+	public static final String FIELD_WIDTH = "width";    		/* 宽度*/
+	public static final String FIELD_THICK = "thick";    		/* 厚度*/
 	public static final String FIELD_PLAN_WEIGHT = "planWeight";    		/* 计划重量*/
 	public static final String FIELD_PUR_QTY = "purQty";    		/* 采购数量*/
 	public static final String FIELD_PUR_WEIGHT = "purWeight";    		/* 采购重量*/
@@ -67,6 +70,7 @@ public class HGCG001 extends DaoEPBase {
 	public static final String COL_PLAN_NO = "PLAN_NO";    		/* 计划单号*/
 	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
 	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
+	public static final String COL_SPEC_ID = "SPEC_ID";    		/* 规格ID*/
 	public static final String COL_SPEC = "SPEC";    		/* 规格*/
 	public static final String COL_MATERIAL = "MATERIAL";    		/* 材质*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长度*/
@@ -101,9 +105,12 @@ public class HGCG001 extends DaoEPBase {
 	private String planNo = " ";		/* 计划单号*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
+	private Long specId;		/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private String material = " ";		/* 材质*/
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
 	private BigDecimal planWeight = new BigDecimal(0.000);		/* 计划重量*/
 	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
@@ -183,7 +190,11 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
 		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SPEC_ID);
+		eiColumn.setDescName("规格ID");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_SPEC);
 		eiColumn.setDescName("规格");
 		eiMetadata.addMeta(eiColumn);
@@ -191,13 +202,27 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_MATERIAL);
 		eiColumn.setDescName("材质");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_LENGTH);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("长度");
 		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("宽度");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("厚度");
+		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_PLAN_WEIGHT);
 		eiColumn.setType("N");
@@ -506,6 +531,31 @@ public class HGCG001 extends DaoEPBase {
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
+	
+	public Long getSpecId() {
+		return specId;
+	}
+	
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	
+	public BigDecimal getWidth() {
+		return width;
+	}
+	
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	
+	public BigDecimal getThick() {
+		return thick;
+	}
+	
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	
 	/**
 	 * get the spec - 规格.
 	 * @return the spec
@@ -706,9 +756,12 @@ public class HGCG001 extends DaoEPBase {
 		setPlanNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_NO)), planNo));
 		setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
 		setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
+		setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
 		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
 		setMaterial(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MATERIAL)), material));
 		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_LENGTH)), length));
+		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
+		setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THICK)), thick));
 		setPlanWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PLAN_WEIGHT)), planWeight));
 		setPurQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PUR_QTY)), purQty));
 		setPurWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PUR_WEIGHT)), purWeight));
@@ -742,9 +795,12 @@ public class HGCG001 extends DaoEPBase {
 		map.put(FIELD_PLAN_NO, StringUtils.toString(planNo, eiMetadata.getMeta(FIELD_PLAN_NO)));
 		map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
 		map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
+		map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
 		map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
 		map.put(FIELD_MATERIAL, StringUtils.toString(material, eiMetadata.getMeta(FIELD_MATERIAL)));
 		map.put(FIELD_LENGTH, StringUtils.toString(length, eiMetadata.getMeta(FIELD_LENGTH)));
+		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));
+		map.put(FIELD_THICK, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_THICK)));
 		map.put(FIELD_PLAN_WEIGHT, StringUtils.toString(planWeight, eiMetadata.getMeta(FIELD_PLAN_WEIGHT)));
 		map.put(FIELD_PUR_QTY, StringUtils.toString(purQty, eiMetadata.getMeta(FIELD_PUR_QTY)));
 		map.put(FIELD_PUR_WEIGHT, StringUtils.toString(purWeight, eiMetadata.getMeta(FIELD_PUR_WEIGHT)));

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002.java

@@ -43,9 +43,12 @@ public class HGCG002 extends DaoEPBase {
 	public static final String FIELD_PUR_USER_NAME = "purUserName";    		/* 采购员名称*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
+	public static final String FIELD_SPEC_ID = "specId";    		/* 规格ID*/
 	public static final String FIELD_SPEC = "spec";    		/* 规格*/
 	public static final String FIELD_MATERIAL = "material";    		/* 材质*/
 	public static final String FIELD_LENGTH = "length";    		/* 长度*/
+	public static final String FIELD_WIDTH = "width";    		/* 宽度*/
+	public static final String FIELD_THICK = "thick";    		/* 厚度*/
 	public static final String FIELD_PUR_QTY = "purQty";    		/* 采购数量*/
 	public static final String FIELD_PUR_WEIGHT = "purWeight";    		/* 采购重量*/
 	public static final String FIELD_RECEIVE_QTY = "receiveQty";    		/* 收货数量*/
@@ -115,9 +118,12 @@ public class HGCG002 extends DaoEPBase {
 	private String purUserName = " ";		/* 采购员名称*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
+	private Long specId;		/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private String material = " ";		/* 材质*/
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
 	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
 	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
@@ -217,7 +223,11 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
 		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SPEC_ID);
+		eiColumn.setDescName("规格ID");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_SPEC);
 		eiColumn.setDescName("规格");
 		eiMetadata.addMeta(eiColumn);
@@ -232,7 +242,21 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("长度");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("宽度");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("厚度");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_PUR_QTY);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -796,6 +820,31 @@ public class HGCG002 extends DaoEPBase {
 	public void setAuditReason(String auditReason) {
 		this.auditReason = auditReason;
 	}
+	
+	public Long getSpecId() {
+		return specId;
+	}
+	
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	
+	public BigDecimal getWidth() {
+		return width;
+	}
+	
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	
+	public BigDecimal getThick() {
+		return thick;
+	}
+	
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -836,6 +885,9 @@ public class HGCG002 extends DaoEPBase {
 		setAuditUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_ID)), auditUserId));
 		setAuditUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_NAME)), auditUserName));
 		setAuditReason(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_REASON)), auditReason));
+		setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
+		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
+		setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THICK)), thick));
 	}
 
 	/**
@@ -877,7 +929,10 @@ public class HGCG002 extends DaoEPBase {
 		map.put(FIELD_AUDIT_USER_ID, StringUtils.toString(auditUserId, eiMetadata.getMeta(FIELD_AUDIT_USER_ID)));
 		map.put(FIELD_AUDIT_USER_NAME, StringUtils.toString(auditUserName, eiMetadata.getMeta(FIELD_AUDIT_USER_NAME)));
 		map.put(FIELD_AUDIT_REASON, StringUtils.toString(auditReason, eiMetadata.getMeta(FIELD_AUDIT_REASON)));
-
+		map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
+		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));
+		map.put(FIELD_THICK, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_THICK)));
+		
 		return map;
 	}
 }

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003.java

@@ -52,6 +52,9 @@ public class HGCG003 extends DaoEPBase {
 	public static final String FIELD_DEPOSIT_QTY = "depositQty";    		/* 入库数量*/
 	public static final String FIELD_RECEIVE_WEIGHT = "receiveWeight";    		/* 收货重量*/
 	public static final String FIELD_STATUS = "status";    		/* 状态：0-已收货，1-已入库，2-部分入库，3-退货*/
+	public static final String FIELD_SPEC_ID = "specId";    		/* 规格ID*/
+	public static final String FIELD_WIDTH = "width";    		/* 宽度*/
+	public static final String FIELD_THICK = "thick";    		/* 厚度*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -120,6 +123,9 @@ public class HGCG003 extends DaoEPBase {
 	private BigDecimal depositQty = new BigDecimal(0.000);		/* 入库数量*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-已收货，1-已入库，2-部分入库，3-退货*/
+	private Long specId;		/* 规格ID*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
 
 	/**
 	 * initialize the metadata.
@@ -262,7 +268,24 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_STATUS);
 		eiColumn.setDescName("状态：0-已收货，1-已入库，2-部分入库，3-退货");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SPEC_ID);
+		eiColumn.setDescName("规格ID");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("宽度");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("厚度");
+		eiMetadata.addMeta(eiColumn);
 
 	}
 
@@ -753,6 +776,31 @@ public class HGCG003 extends DaoEPBase {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+	
+	public Long getSpecId() {
+		return specId;
+	}
+	
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	
+	public BigDecimal getWidth() {
+		return width;
+	}
+	
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	
+	public BigDecimal getThick() {
+		return thick;
+	}
+	
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -791,6 +839,9 @@ public class HGCG003 extends DaoEPBase {
 		setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty));
 		setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
+		setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
+		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
+		setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THICK)), thick));
 	}
 
 	/**
@@ -830,7 +881,10 @@ public class HGCG003 extends DaoEPBase {
 		map.put(FIELD_DEPOSIT_QTY, StringUtils.toString(depositQty, eiMetadata.getMeta(FIELD_DEPOSIT_QTY)));
 		map.put(FIELD_RECEIVE_WEIGHT, StringUtils.toString(receiveWeight, eiMetadata.getMeta(FIELD_RECEIVE_WEIGHT)));
 		map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
-
+		map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
+		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));
+		map.put(FIELD_THICK, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_THICK)));
+		
 		return map;
 	}
 }

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG001.java

@@ -44,6 +44,8 @@ public class ServiceHGCG001 extends ServiceBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002.java

@@ -17,7 +17,6 @@ import com.baosight.hggp.util.DateUtils;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.MapUtils;
-import com.baosight.hggp.util.ObjectUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -45,6 +44,8 @@ public class ServiceHGCG002 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG002().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002A.java

@@ -45,6 +45,8 @@ public class ServiceHGCG002A extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003.java

@@ -4,7 +4,6 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
-import com.baosight.hggp.hg.cg.domain.HGCG002;
 import com.baosight.hggp.hg.cg.domain.HGCG002A;
 import com.baosight.hggp.hg.cg.domain.HGCG003;
 import com.baosight.hggp.hg.cg.tools.HGCGTools;
@@ -45,6 +44,8 @@ public class ServiceHGCG003 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG003().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003A.java

@@ -47,6 +47,8 @@ public class ServiceHGCG003A extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG002A().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG001.xml

@@ -28,12 +28,16 @@
         AUDIT_TIME as "auditTime",  <!-- 审核时间 -->
         AUDIT_USER_ID as "auditUserId",  <!-- 审核人ID -->
         AUDIT_USER_NAME as "auditUserName",  <!-- 审核人名称 -->
-        AUDIT_REASON as "auditReason" <!-- 审核原因 -->
+        AUDIT_REASON as "auditReason", <!-- 审核原因 -->
+        SPEC_ID as "specId",    <!-- 规格ID -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick"  <!-- 厚度 -->
     </sql>
 
 	<sql id="condition">
         AND DELETE_FLAG = 0
         <include refid="HGXSDataAuth.authCondition"/>
+        <include refid="BaseCondition.specCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
 		<isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG002.xml

@@ -34,7 +34,10 @@
         AUDIT_TIME as "auditTime",  <!-- 审核时间 -->
         AUDIT_USER_ID as "auditUserId",  <!-- 审核人ID -->
         AUDIT_USER_NAME as "auditUserName",  <!-- 审核人名称 -->
-        AUDIT_REASON as "auditReason" <!-- 审核原因 -->
+        AUDIT_REASON as "auditReason", <!-- 审核原因 -->
+        SPEC_ID as "specId",    <!-- 规格ID -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick"  <!-- 厚度 -->
     </sql>
 
     <sql id="qtyColumn">
@@ -44,6 +47,7 @@
     <sql id="condition">
         AND DELETE_FLAG = 0
         <include refid="HGXSDataAuth.authCondition"/>
+        <include refid="BaseCondition.specCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
         <isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG003.xml

@@ -32,12 +32,16 @@
         DELIVER_QTY as "deliverQty",  <!-- 退货数量 -->
         DEPOSIT_QTY as "depositQty",  <!-- 入库数量 -->
         RECEIVE_WEIGHT as "receiveWeight",  <!-- 收货重量 -->
-        STATUS as "status" <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
+        STATUS as "status", <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
+        SPEC_ID as "specId",    <!-- 规格ID -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick"  <!-- 厚度 -->
     </sql>
 
     <sql id="condition">
         AND DELETE_FLAG = 0
         <include refid="HGXSDataAuth.authCondition"/>
+        <include refid="BaseCondition.specCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
         <isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ004.java

@@ -220,7 +220,7 @@ public class ServiceHGPZ004 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "父级下拉框")
 	public EiInfo queryParComboBox(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();
@@ -231,5 +231,7 @@ public class ServiceHGPZ004 extends ServiceBase {
 		}
 		return inInfo;
 	}
+
+
 	
 }

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ005.java

@@ -19,10 +19,7 @@ import com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 存货档案
@@ -222,5 +219,42 @@ public class ServiceHGPZ005 extends ServiceBase {
 		}
 		return inInfo;
 	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
+	public EiInfo queryComboBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
+	public EiInfo queryComboBoxAll(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_ALL_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
 	
 }

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ007.java

@@ -7,10 +7,7 @@ import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.pz.domain.HGPZ007;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
-import com.baosight.hggp.util.AssertUtils;
-import com.baosight.hggp.util.CommonMethod;
-import com.baosight.hggp.util.DateUtils;
-import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ProjectInfo;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -21,10 +18,7 @@ import com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 仓库档案
@@ -217,5 +211,23 @@ public class ServiceHGPZ007 extends ServiceBase {
 		}
 		return inInfo;
 	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "下拉框")
+	public EiInfo queryComboBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.WH_RECORD_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
 	
 }

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ010.java

 package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.pz.domain.HGPZ010;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.contants.ACConstants;
@@ -19,6 +21,7 @@ import com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +44,9 @@ public class ServiceHGPZ010 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "库存预警", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_TYPE_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ010().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml

@@ -4,26 +4,26 @@
    		Version :  1.0
 		schema : hggp
 		tableName : HGPZ005
-		 ID  BIGINT   NOT NULL   primarykey, 
-		 ACCOUNT_CODE  VARCHAR, 
-		 DEP_CODE  VARCHAR, 
-		 INVENT_TYPE  TINYINT   NOT NULL, 
-		 INVENT_CODE  VARCHAR   NOT NULL, 
-		 INVENT_NAME  VARCHAR   NOT NULL, 
-		 SPEC  VARCHAR, 
-		 LENGTH  DECIMAL, 
+		 ID  BIGINT   NOT NULL   primarykey,
+		 ACCOUNT_CODE  VARCHAR,
+		 DEP_CODE  VARCHAR,
+		 INVENT_TYPE  TINYINT   NOT NULL,
+		 INVENT_CODE  VARCHAR   NOT NULL,
+		 INVENT_NAME  VARCHAR   NOT NULL,
+		 SPEC  VARCHAR,
+		 LENGTH  DECIMAL,
 		 WIDTH  DECIMAL,
-		 THICK  DECIMAL, 
-		 MATERIAL  VARCHAR, 
-		 COEFFICIENT  DECIMAL, 
-		 UNIT  VARCHAR, 
-		 STATUS  TINYINT   NOT NULL, 
-		 CREATED_BY  VARCHAR, 
-		 CREATED_NAME  VARCHAR, 
-		 CREATED_TIME  VARCHAR, 
-		 UPDATED_BY  VARCHAR, 
-		 UPDATED_NAME  VARCHAR, 
-		 UPDATED_TIME  VARCHAR, 
+		 THICK  DECIMAL,
+		 MATERIAL  VARCHAR,
+		 COEFFICIENT  DECIMAL,
+		 UNIT  VARCHAR,
+		 STATUS  TINYINT   NOT NULL,
+		 CREATED_BY  VARCHAR,
+		 CREATED_NAME  VARCHAR,
+		 CREATED_TIME  VARCHAR,
+		 UPDATED_BY  VARCHAR,
+		 UPDATED_NAME  VARCHAR,
+		 UPDATED_TIME  VARCHAR,
 		 DELETE_FLAG  TINYINT
 	-->
 <sqlMap namespace="HGPZ005">
@@ -117,7 +117,7 @@
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ005">
 		SELECT
-				ID	as "id",  
+				ID	as "id",
 				ACCOUNT_CODE	as "accountCode",  <!-- 帐套编码 -->
 				DEP_CODE	as "depCode",  <!-- 部门编码 -->
 				INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
@@ -298,4 +298,34 @@
 		ORDER BY INVENT_CODE
 	</select>
 
+	<!-- 缺省下拉框 -->
+	<select id="queryComboBoxAll" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		ID AS "id",
+		(CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec",
+		LENGTH AS "length" ,  <!-- 长 -->
+		WIDTH AS "width" ,  <!-- 宽 -->
+		THICK AS "thick" ,  <!-- 厚 -->
+		COEFFICIENT AS "coefficient" ,  <!-- 系数 -->
+		MATERIAL AS "material" ,  <!-- 材质 -->
+		UNIT AS "unit"   <!-- 单位 -->
+		FROM ${hggpSchema}.HGPZ005
+		WHERE DELETE_FLAG = 0
+		AND STATUS = 1
+		<include refid="condition"/>
+		ORDER BY ID
+	</select>
+
+    <!-- 规格下拉框(无ID) -->
+    <select id="queryComboBoxSpecName" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+        SELECT DISTINCT
+        (CASE WHEN COALESCE(SPEC, '') = '' THEN '无规格' ELSE SPEC END) AS "spec"
+        FROM ${hggpSchema}.HGPZ005
+        WHERE 1=1
+        AND DELETE_FLAG = 0
+        AND STATUS = 1
+        <include refid="condition"/>
+        ORDER BY SPEC DESC
+    </select>
+
 </sqlMap>

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ010.xml

@@ -233,8 +233,7 @@
 	</insert>
 
 	<delete id="delete">
-		DELETE FROM ${hggpSchema}.HGPZ010 WHERE
-			ID = #id#
+		UPDATE ${hggpSchema}.HGPZ010 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB001.xml

@@ -168,7 +168,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				PURCHASE_DATE desc,MAINTAIN_DATE desc,ID asc
+				PURCHASE_DATE desc,CREATED_TIME DESC,ID asc
 			</isEmpty>
 		</dynamic>
 

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -6,6 +6,9 @@
     <settings useStatementNamespaces="true" />
     <sqlMap resource="resources/ibatis/Dummy.xml" />
 
+    <!-- 基础查询条件 -->
+    <sqlMap resource="com/baosight/hggp/core/dao/BaseCondition.xml"/>
+
     <!-- 数据权限 -->
     <sqlMap resource="com/baosight/hggp/hg/xs/sql/HGXSDataAuth.xml"/>
 

src/main/webapp/HG/CG/HGCG001.jsp

@@ -23,10 +23,10 @@
 		<div class="row">
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"
-			             defultValue="">
+			<EF:EFSelect cname="规格" blockId="inqu_status" ename="spec" row="0" colWidth="3"
+			             filter="contains" optionLabel="全部" defultValue="">
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFDateSpan startCname="创建时间(从)" endCname="至" blockId="inqu_status"
@@ -49,14 +49,15 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="120" align="center"
-			             hidden="true"/>
+			<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<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/HG/CG/HGCG002.jsp

@@ -28,7 +28,7 @@
 			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"
 			             defultValue="">
@@ -62,12 +62,15 @@
 			<EF:EFColumn ename="purUserName" cname="采购员" width="100" align="center" required="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="receiveQty" cname="已收货数量" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<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/HG/CG/HGCG002A.jsp

@@ -17,7 +17,7 @@
 			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>
 		<div class="row">
@@ -48,13 +48,14 @@
 			<EF:EFColumn ename="purUserName" cname="采购员" width="100" align="center" maxLength="100" required="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="120" align="center"
-			             hidden="true"/>
+			<EF:EFColumn ename="sepcId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<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/HG/CG/HGCG003.jsp

@@ -28,7 +28,7 @@
 			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"
 			             defultValue="">
@@ -55,20 +55,21 @@
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hggp.hgcg.receiveStatus"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="supCode" cname="供应商名称" enable="false" width="120" align="left">
-				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
-			</EF:EFComboColumn>
+			<EF:EFColumn ename="supCode" cname="供应商编码" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="purUserName" cname="采购员" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="receiveQty" cname="收货数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="receiveWeight" cname="收货重量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<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/HG/CG/HGCG003A.js

@@ -2,6 +2,9 @@ $(function () {
 	IPLATUI.EFGrid = {
 		"result": {
 			columns: [],
+			onRowClick: function (e){
+				setBcReceiveQty();
+			},
 			loadComplete: function (grid) {
 			}
 		}
@@ -37,20 +40,27 @@ let resultCheckClick = function (){
 		if (action != true) {
 			return;
 		}
-		let checkRows = resultGrid.getCheckedRows();
-		let checkRowIndexs = resultGrid.getCheckedRowsIndex();
-		for (let rowNo = 0; rowNo < checkRowIndexs.length; rowNo++) {
-			let index = checkRowIndexs[rowNo];
-			let bcReceiveQty = checkRows[rowNo]["bcReceiveQty"];
-			let bcMaxReceiveQty = checkRows[rowNo]["bcMaxReceiveQty"];
-			if (isBlank(bcReceiveQty) || bcReceiveQty == 0) {
-				resultGrid.setCellValue(index, "bcReceiveQty", bcMaxReceiveQty);
-			}
-		}
+		setBcReceiveQty();
 	});
 }
 
 /**
+ * 设置本次送货量
+ */
+let setBcReceiveQty = function (){
+	let checkRows = resultGrid.getCheckedRows();
+	let checkRowIndexs = resultGrid.getCheckedRowsIndex();
+	for (let rowNo = 0; rowNo < checkRowIndexs.length; rowNo++) {
+		let index = checkRowIndexs[rowNo];
+		let bcReceiveQty = checkRows[rowNo]["bcReceiveQty"];
+		let bcMaxReceiveQty = checkRows[rowNo]["bcMaxReceiveQty"];
+		if (isBlank(bcReceiveQty) || bcReceiveQty == 0) {
+			resultGrid.setCellValue(index, "bcReceiveQty", bcMaxReceiveQty);
+		}
+	}
+}
+
+/**
  * 查询
  */
 var query = function (e) {

src/main/webapp/HG/CG/HGCG003A.jsp

@@ -28,7 +28,7 @@
 			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"
 			             defultValue="">
@@ -51,10 +51,13 @@
 			<EF:EFColumn ename="contractDate" cname="合同日期" enable="false" width="100" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 			<EF:EFColumn ename="contractNo" cname="合同号" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="planNo" cname="计划单号" enable="false" width="120" align="center"/>
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hggp.hgcg.contractStatus"/>
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="bcReceiveQty" cname="本次</br>收货数量" width="100" align="right" format="{0:N3}"
 			             required="true"/>
 			<EF:EFColumn ename="bcMaxReceiveQty" cname="本次最大</br>收货数量" enable="false" width="100" align="right"
@@ -62,17 +65,16 @@
 			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="100" align="right" format="{0:N3}"/>
-
 			<EF:EFComboColumn ename="supCode" cname="供应商名称" enable="false" width="120" align="left" defaultValue=""
 			                  filter="contains">
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="purUserName" cname="采购员" enable="false" width="100" align="center" required="true"/>
-			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="planNo" cname="计划单号" enable="false" width="120" align="center"/>
 			<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/HG/PZ/HGPZ010.js

+let InventNameGlobalData = [];
+let WhNameGlobalData = [];
+let inventAllGlobalData = [];
 $(function() {
 
 	// 查询
@@ -9,6 +12,85 @@ $(function() {
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
 		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["whType"]);
+				inInfo.set("inqu_status-0-isSplicingSymbol", false);
+				inInfo.set("serviceName", "HGPZ007");
+				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++) {
+					if (InventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+						return InventNameGlobalData[i]['textField'];
+					}
+				}
+				return "";
+			},
+			editor: function (container, options) {
+				let inInfo = new EiInfo();
+				inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
+				inInfo.set("inqu_status-0-isSplicingSymbol", false);
+				inInfo.set("serviceName", "HGPZ005");
+				inInfo.set("methodName", "queryComboBox");
+				inInfo.set("blockId", "invent_record_block_id");
+				inInfo.set("field", options.field);
+				refreshSelect(container, inInfo);
+			}
+		},{
+			field: "inventRecordId",
+			template: function (dataItem) {
+				for (let i = 0; i < inventAllGlobalData.length; i++) {
+					if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+						return inventAllGlobalData[i]['textField'];
+					}
+				}
+				return "";
+			},
+			editor: function (container, options) {
+				let inInfo = new EiInfo();
+				inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
+				inInfo.set("serviceName", "HGPZ005");
+				inInfo.set("methodName", "queryComboBoxAll");
+				inInfo.set("blockId", "invent_all_block_id");
+				inInfo.set("field", options.field);
+				refreshSelect(container, inInfo);
+			}
+		}, {
+			field: "material",
+			template: function (dataItem) {
+				for (let i = 0; i < inventAllGlobalData.length; i++) {
+					if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+						return inventAllGlobalData[i]['param1Field'];
+					}
+				}
+				return "";
+			}
+		}, {
+			field: "unit",
+			template: function (dataItem) {
+				for (let i = 0; i < inventAllGlobalData.length; i++) {
+					if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+						return inventAllGlobalData[i]['param2Field'];
+					}
+				}
+				return "";
+			}
+		},{
 			field: "createdName",
 			template: function (options) {
 				return showUserName(options.createdBy, options.createdName);
@@ -19,6 +101,22 @@ $(function() {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
 		}],
+		loadComplete: function (grid) {
+			// 此grid对象
+			grid.dataSource.bind("change", function(e) {
+				if (e.field == "inventRecordId") {
+					var tr,index;
+					// 获取此model元素信息
+					var item = e.items[0];
+					for (let i = 0; i < inventAllGlobalData.length; i++) {
+						if (inventAllGlobalData[i]['valueField'] === item.inventRecordId) {
+							resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field'])
+							resultGrid.setCellValue(item, 'unit', inventAllGlobalData[i]['param2Field'])
+						}
+					}
+				}
+			});
+		},
 		onSuccess: function (e) {
 			if(e.eiInfo.extAttr.methodName == 'save'
 				||e.eiInfo.extAttr.methodName == 'delete' ){
@@ -45,6 +143,9 @@ $(function() {
 $(window).load(function () {
 	// 查询
 	query();
+	initWh();
+	initInvent();
+	initSpec();
 });
 
 /**
@@ -55,6 +156,50 @@ let query = function () {
 }
 
 /**
+ * 初始化存货
+ */
+let initWh = function () {
+	let inInfo = new EiInfo();
+	EiCommunicator.send("HGPZ007", "queryComboBox", inInfo, {
+		onSuccess: function (ei) {
+			WhNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
+}
+
+/**
+ * 初始化存货
+ */
+let initInvent = function () {
+	let inInfo = new EiInfo();
+	EiCommunicator.send("HGPZ005", "queryComboBox", inInfo, {
+		onSuccess: function (ei) {
+			InventNameGlobalData = ei.getBlock("invent_record_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
+}
+
+/**
+ * 初始化规格
+ */
+let initSpec = function () {
+	let inInfo = new EiInfo();
+	inInfo.set("inqu_status-0-inventTypes", [1, 2]);
+	inInfo.set("inqu_status-0-isSplicingSymbol", false);
+	EiCommunicator.send("HGPZ005", "queryComboBoxAll", inInfo, {
+		onSuccess: function (ei) {
+			inventAllGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
+}
+
+/**
  * 保存
  */
 let save = function () {
@@ -65,45 +210,39 @@ let save = function () {
 	}
 	let flag = true;
 	$.each(rows, function(index, item) {
-		let custType= item.get("custType");
-		let custName= item.get("custName");
-		let companyName= item.get("companyName");
-		let headName= item.get("headName");
-		let phoneName= item.get("phoneName");
-		let address= item.get("address");
-		let status= item.get("status");
-		if(isBlank(custType)){
-			message("选中的第"+(index+1)+"行\"供应商类型\"，不能为空!");
-			flag = false;
-			return false;
-		}
-		if(isBlank(custName)){
-			message("选中的第"+(index+1)+"行\"供应商名称\"，不能为空!");
+		let whType= item.get("whType");
+		let whCode= item.get("whCode");
+		let inventType= item.get("inventType");
+		let inventCode= item.get("inventCode");
+		let inventRecordId= item.get("inventRecordId");
+		let warnNum= item.get("warnNum");
+		if(isBlank(whType)){
+			message("选中的第"+(index+1)+"行\"仓库类型\"，不能为空!");
 			flag = false;
 			return false;
 		}
-		if(isBlank(companyName)){
-			message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
+		if(isBlank(whCode)){
+			message("选中的第"+(index+1)+"行\"仓库名称\"，不能为空!");
 			flag = false;
 			return false;
 		}
-		if(isBlank(headName)){
-			message("选中的第"+(index+1)+"行\"负责人\"，不能为空!");
+		if(isBlank(inventType)){
+			message("选中的第"+(index+1)+"行\"存货类型\"，不能为空!");
 			flag = false;
 			return false;
 		}
-		if(isBlank(phoneName)){
-			message("选中的第"+(index+1)+"行\"负责人联系方式\"，不能为空!");
+		if(isBlank(inventCode)){
+			message("选中的第"+(index+1)+"行\"存货名称\"，不能为空!");
 			flag = false;
 			return false;
 		}
-		if(isBlank(address)){
-			message("选中的第"+(index+1)+"行\"地址\"，不能为空!");
+		if(isBlank(inventRecordId)){
+			message("选中的第"+(index+1)+"行\"规格\"，不能为空!");
 			flag = false;
 			return false;
 		}
-		if(isBlank(status)){
-			message("选中的第"+(index+1)+"行\"状态\"，不能为空!");
+		if(!isPositiveInteger(warnNum)){
+			message("选中的第"+(index+1)+"行\"预警值\"，必须是大于0的整数!");
 			flag = false;
 			return false;
 		}

src/main/webapp/HG/PZ/HGPZ010.jsp

@@ -15,7 +15,7 @@
 			<EF:EFSelect cname="仓库类型" blockId="inqu_status" ename="whType" row="0" colWidth="3" filter="contains"
 						 defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_type_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="wh_type_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
@@ -23,11 +23,17 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override"  isFloat="true">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
-							  readonly="true">
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
+			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true"
+							  blockName="wh_type_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
+							  filter="contains">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center" required="true"
+							  blockName="invent_type_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
+							  filter="contains">
+			</EF:EFComboColumn>
 			<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="material" cname="材质" width="120" align="center" enable="false"/>

src/main/webapp/HG/SB/HGSB001.jsp

@@ -9,8 +9,12 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
 
 <EF:EFPage  title="设备台账">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -68,7 +72,7 @@
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="deviceUserId" cname="设备负责人"
+            <EF:EFComboColumn ename="deviceUserId" cname="设备负责人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"

src/main/webapp/HG/SB/HGSB002.jsp

@@ -9,8 +9,13 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
+
 
 <EF:EFPage  title="设备计划">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -67,7 +72,7 @@
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
             <EF:EFColumn ename="planEndDate" cname="计划结束日期" width="120" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="planUserId" cname="计划人"
+            <EF:EFComboColumn ename="planUserId" cname="计划人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"

src/main/webapp/HG/SB/HGSB003.jsp

@@ -9,8 +9,12 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
 
 <EF:EFPage  title="设备维修申请">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -52,7 +56,7 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="checkItem" cname="检查项" width="100" enable="true" readonly="false" align="center" required="true"/>
             <EF:EFColumn ename="checkDescrip" cname="检查描述" type="textarea" width="160" align="center"/>
-            <EF:EFComboColumn ename="applyUserId" cname="申请人"
+            <EF:EFComboColumn ename="applyUserId" cname="申请人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"