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

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

@@ -14,4 +14,14 @@
         </isNotEmpty>
     </sql>
 
+    <!-- 创建时间 -->
+    <sql id="createdTimeCondition">
+        <isNotEmpty prepend=" AND " property="createdTimeFrom">
+            CREATED_TIME &gt;= #createdTimeFrom#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdTimeTo">
+            CREATED_TIME &lt;= #createdTimeTo#
+        </isNotEmpty>
+    </sql>
+
 </sqlMap>

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

 package com.baosight.hggp.hg.cg.domain;
 
-import com.baosight.iplat4j.core.data.DaoEPBase;
-import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.util.NumberUtils;
-import com.baosight.iplat4j.core.util.StringUtils;
-
 import java.math.BigDecimal;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
 import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
 
 /**
  * Project: <br>
@@ -17,7 +16,7 @@ import java.util.Map;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-09 10:58:30 create
+ * @history 2024-05-11 16:45:56 create
  */
 public class HGCG001 extends DaoEPBase {
 	
@@ -37,14 +36,17 @@ public class HGCG001 extends DaoEPBase {
 	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
 	public static final String FIELD_PLAN_DATE = "planDate";    		/* 计划日期*/
 	public static final String FIELD_PLAN_NO = "planNo";    		/* 计划单号*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	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_UNIT = "unit";    		/* 单位*/
 	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_QTY = "planQty";    		/* 计划数量*/
 	public static final String FIELD_PLAN_WEIGHT = "planWeight";    		/* 计划重量*/
 	public static final String FIELD_PUR_QTY = "purQty";    		/* 采购数量*/
 	public static final String FIELD_PUR_WEIGHT = "purWeight";    		/* 采购重量*/
@@ -68,12 +70,17 @@ public class HGCG001 extends DaoEPBase {
 	public static final String COL_COMPANY_NAME = "COMPANY_NAME";    		/* 公司名称*/
 	public static final String COL_PLAN_DATE = "PLAN_DATE";    		/* 计划日期*/
 	public static final String COL_PLAN_NO = "PLAN_NO";    		/* 计划单号*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
 	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_UNIT = "UNIT";    		/* 单位*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长度*/
+	public static final String COL_WIDTH = "WIDTH";    		/* 宽度*/
+	public static final String COL_THICK = "THICK";    		/* 厚度*/
+	public static final String COL_PLAN_QTY = "PLAN_QTY";    		/* 计划数量*/
 	public static final String COL_PLAN_WEIGHT = "PLAN_WEIGHT";    		/* 计划重量*/
 	public static final String COL_PUR_QTY = "PUR_QTY";    		/* 采购数量*/
 	public static final String COL_PUR_WEIGHT = "PUR_WEIGHT";    		/* 采购重量*/
@@ -98,19 +105,22 @@ public class HGCG001 extends DaoEPBase {
 	private String updatedBy = " ";		/* 记录修改者*/
 	private String updatedName = " ";		/* 记录修改名称*/
 	private String updatedTime = " ";		/* 记录修改时间*/
-	private Integer deleteFlag = 0;	/* 0-未删除，1-已删除*/
+	private Integer deleteFlag;	/* 0-未删除，1-已删除*/
 	private String companyCode = " ";		/* 公司编码*/
 	private String companyName = " ";		/* 公司名称*/
 	private String planDate = " ";		/* 计划日期*/
 	private String planNo = " ";		/* 计划单号*/
+	private String inventType = " ";		/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
-	private Long specId;		/* 规格ID*/
+	private Long specId = new Long(0);	/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private String material = " ";		/* 材质*/
+	private String unit = " ";		/* 单位*/
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
+	private BigDecimal planQty = 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,6 +193,10 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn.setDescName("计划单号");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
+		eiColumn.setDescName("存货类型");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
 		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
@@ -203,6 +217,10 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn.setDescName("材质");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_UNIT);
+		eiColumn.setDescName("单位");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_LENGTH);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -224,6 +242,13 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn.setDescName("厚度");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_PLAN_QTY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("计划数量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_PLAN_WEIGHT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -500,6 +525,22 @@ public class HGCG001 extends DaoEPBase {
 		this.planNo = planNo;
 	}
 	/**
+	 * get the inventType - 存货类型.
+	 * @return the inventType
+	 */
+	public String getInventType() {
+		return this.inventType;
+	}
+	
+	/**
+	 * set the inventType - 存货类型.
+	 *
+	 * @param inventType - 存货类型
+	 */
+	public void setInventType(String inventType) {
+		this.inventType = inventType;
+	}
+	/**
 	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
@@ -531,31 +572,22 @@ public class HGCG001 extends DaoEPBase {
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
-	
+	/**
+	 * get the specId - 规格ID.
+	 * @return the specId
+	 */
 	public Long getSpecId() {
-		return specId;
+		return this.specId;
 	}
 	
+	/**
+	 * set the specId - 规格ID.
+	 *
+	 * @param specId - 规格ID
+	 */
 	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
@@ -589,6 +621,22 @@ public class HGCG001 extends DaoEPBase {
 		this.material = material;
 	}
 	/**
+	 * get the unit - 单位.
+	 * @return the unit
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	
+	/**
+	 * set the unit - 单位.
+	 *
+	 * @param unit - 单位
+	 */
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	/**
 	 * get the length - 长度.
 	 * @return the length
 	 */
@@ -605,6 +653,54 @@ public class HGCG001 extends DaoEPBase {
 		this.length = length;
 	}
 	/**
+	 * get the width - 宽度.
+	 * @return the width
+	 */
+	public BigDecimal getWidth() {
+		return this.width;
+	}
+	
+	/**
+	 * set the width - 宽度.
+	 *
+	 * @param width - 宽度
+	 */
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	/**
+	 * get the thick - 厚度.
+	 * @return the thick
+	 */
+	public BigDecimal getThick() {
+		return this.thick;
+	}
+	
+	/**
+	 * set the thick - 厚度.
+	 *
+	 * @param thick - 厚度
+	 */
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	/**
+	 * get the planQty - 计划数量.
+	 * @return the planQty
+	 */
+	public BigDecimal getPlanQty() {
+		return this.planQty;
+	}
+	
+	/**
+	 * set the planQty - 计划数量.
+	 *
+	 * @param planQty - 计划数量
+	 */
+	public void setPlanQty(BigDecimal planQty) {
+		this.planQty = planQty;
+	}
+	/**
 	 * get the planWeight - 计划重量.
 	 * @return the planWeight
 	 */
@@ -754,14 +850,17 @@ public class HGCG001 extends DaoEPBase {
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
 		setPlanDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_DATE)), planDate));
 		setPlanNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_NO)), planNo));
+		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		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));
+		setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
 		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));
+		setPlanQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PLAN_QTY)), planQty));
 		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));
@@ -793,14 +892,17 @@ public class HGCG001 extends DaoEPBase {
 		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
 		map.put(FIELD_PLAN_DATE, StringUtils.toString(planDate, eiMetadata.getMeta(FIELD_PLAN_DATE)));
 		map.put(FIELD_PLAN_NO, StringUtils.toString(planNo, eiMetadata.getMeta(FIELD_PLAN_NO)));
+		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		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_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
 		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_QTY, StringUtils.toString(planQty, eiMetadata.getMeta(FIELD_PLAN_QTY)));
 		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

@@ -16,7 +16,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-10 15:20:01 create
+ * @history 2024-05-11 16:32:20 create
  */
 public class HGCG002 extends DaoEPBase {
 	
@@ -41,11 +41,13 @@ public class HGCG002 extends DaoEPBase {
 	public static final String FIELD_SUP_NAME = "supName";    		/* 供应商名称*/
 	public static final String FIELD_PUR_USER_ID = "purUserId";    		/* 采购员*/
 	public static final String FIELD_PUR_USER_NAME = "purUserName";    		/* 采购员名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	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_UNIT = "unit";    		/* 单位*/
 	public static final String FIELD_LENGTH = "length";    		/* 长度*/
 	public static final String FIELD_WIDTH = "width";    		/* 宽度*/
 	public static final String FIELD_THICK = "thick";    		/* 厚度*/
@@ -77,11 +79,16 @@ public class HGCG002 extends DaoEPBase {
 	public static final String COL_SUP_NAME = "SUP_NAME";    		/* 供应商名称*/
 	public static final String COL_PUR_USER_ID = "PUR_USER_ID";    		/* 采购员*/
 	public static final String COL_PUR_USER_NAME = "PUR_USER_NAME";    		/* 采购员名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
 	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_UNIT = "UNIT";    		/* 单位*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长度*/
+	public static final String COL_WIDTH = "WIDTH";    		/* 宽度*/
+	public static final String COL_THICK = "THICK";    		/* 厚度*/
 	public static final String COL_PUR_QTY = "PUR_QTY";    		/* 采购数量*/
 	public static final String COL_PUR_WEIGHT = "PUR_WEIGHT";    		/* 采购重量*/
 	public static final String COL_RECEIVE_QTY = "RECEIVE_QTY";    		/* 收货数量*/
@@ -116,11 +123,13 @@ public class HGCG002 extends DaoEPBase {
 	private String supName = " ";		/* 供应商名称*/
 	private String purUserId = " ";		/* 采购员*/
 	private String purUserName = " ";		/* 采购员名称*/
+	private String inventType = " ";		/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
-	private Long specId;		/* 规格ID*/
+	private Long specId = new Long(0);	/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private String material = " ";		/* 材质*/
+	private String unit = " ";		/* 单位*/
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
@@ -216,6 +225,10 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn.setDescName("采购员名称");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
+		eiColumn.setDescName("存货类型");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
 		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
@@ -236,6 +249,10 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn.setDescName("材质");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_UNIT);
+		eiColumn.setDescName("单位");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_LENGTH);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -613,6 +630,22 @@ public class HGCG002 extends DaoEPBase {
 		this.purUserName = purUserName;
 	}
 	/**
+	 * get the inventType - 存货类型.
+	 * @return the inventType
+	 */
+	public String getInventType() {
+		return this.inventType;
+	}
+	
+	/**
+	 * set the inventType - 存货类型.
+	 *
+	 * @param inventType - 存货类型
+	 */
+	public void setInventType(String inventType) {
+		this.inventType = inventType;
+	}
+	/**
 	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
@@ -645,6 +678,22 @@ public class HGCG002 extends DaoEPBase {
 		this.inventName = inventName;
 	}
 	/**
+	 * get the specId - 规格ID.
+	 * @return the specId
+	 */
+	public Long getSpecId() {
+		return this.specId;
+	}
+	
+	/**
+	 * set the specId - 规格ID.
+	 *
+	 * @param specId - 规格ID
+	 */
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	/**
 	 * get the spec - 规格.
 	 * @return the spec
 	 */
@@ -677,6 +726,22 @@ public class HGCG002 extends DaoEPBase {
 		this.material = material;
 	}
 	/**
+	 * get the unit - 单位.
+	 * @return the unit
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	
+	/**
+	 * set the unit - 单位.
+	 *
+	 * @param unit - 单位
+	 */
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	/**
 	 * get the length - 长度.
 	 * @return the length
 	 */
@@ -693,6 +758,38 @@ public class HGCG002 extends DaoEPBase {
 		this.length = length;
 	}
 	/**
+	 * get the width - 宽度.
+	 * @return the width
+	 */
+	public BigDecimal getWidth() {
+		return this.width;
+	}
+	
+	/**
+	 * set the width - 宽度.
+	 *
+	 * @param width - 宽度
+	 */
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	/**
+	 * get the thick - 厚度.
+	 * @return the thick
+	 */
+	public BigDecimal getThick() {
+		return this.thick;
+	}
+	
+	/**
+	 * set the thick - 厚度.
+	 *
+	 * @param thick - 厚度
+	 */
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	/**
 	 * get the purQty - 采购数量.
 	 * @return the purQty
 	 */
@@ -820,31 +917,6 @@ 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.
 	 *
@@ -872,11 +944,16 @@ public class HGCG002 extends DaoEPBase {
 		setSupName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SUP_NAME)), supName));
 		setPurUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUR_USER_ID)), purUserId));
 		setPurUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUR_USER_NAME)), purUserName));
+		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		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));
+		setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
 		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));
 		setPurQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PUR_QTY)), purQty));
 		setPurWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PUR_WEIGHT)), purWeight));
 		setReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_QTY)), receiveQty));
@@ -885,9 +962,6 @@ 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));
 	}
 	
 	/**
@@ -916,11 +990,16 @@ public class HGCG002 extends DaoEPBase {
 		map.put(FIELD_SUP_NAME, StringUtils.toString(supName, eiMetadata.getMeta(FIELD_SUP_NAME)));
 		map.put(FIELD_PUR_USER_ID, StringUtils.toString(purUserId, eiMetadata.getMeta(FIELD_PUR_USER_ID)));
 		map.put(FIELD_PUR_USER_NAME, StringUtils.toString(purUserName, eiMetadata.getMeta(FIELD_PUR_USER_NAME)));
+		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		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_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
 		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_PUR_QTY, StringUtils.toString(purQty, eiMetadata.getMeta(FIELD_PUR_QTY)));
 		map.put(FIELD_PUR_WEIGHT, StringUtils.toString(purWeight, eiMetadata.getMeta(FIELD_PUR_WEIGHT)));
 		map.put(FIELD_RECEIVE_QTY, StringUtils.toString(receiveQty, eiMetadata.getMeta(FIELD_RECEIVE_QTY)));
@@ -929,9 +1008,6 @@ 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

@@ -16,7 +16,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-10 14:00:09 create
+ * @history 2024-05-11 16:32:26 create
  */
 public class HGCG003 extends DaoEPBase {
 	
@@ -42,19 +42,21 @@ public class HGCG003 extends DaoEPBase {
 	public static final String FIELD_SUP_NAME = "supName";    		/* 供应商名称*/
 	public static final String FIELD_PUR_USER_ID = "purUserId";    		/* 采购员*/
 	public static final String FIELD_PUR_USER_NAME = "purUserName";    		/* 采购员名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	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_UNIT = "unit";    		/* 单位*/
 	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_RECEIVE_QTY = "receiveQty";    		/* 收货数量*/
 	public static final String FIELD_DELIVER_QTY = "deliverQty";    		/* 退货数量*/
 	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";    		/* 企业编码*/
@@ -76,11 +78,16 @@ public class HGCG003 extends DaoEPBase {
 	public static final String COL_SUP_NAME = "SUP_NAME";    		/* 供应商名称*/
 	public static final String COL_PUR_USER_ID = "PUR_USER_ID";    		/* 采购员*/
 	public static final String COL_PUR_USER_NAME = "PUR_USER_NAME";    		/* 采购员名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
 	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_UNIT = "UNIT";    		/* 单位*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长度*/
+	public static final String COL_WIDTH = "WIDTH";    		/* 宽度*/
+	public static final String COL_THICK = "THICK";    		/* 厚度*/
 	public static final String COL_RECEIVE_QTY = "RECEIVE_QTY";    		/* 收货数量*/
 	public static final String COL_DELIVER_QTY = "DELIVER_QTY";    		/* 退货数量*/
 	public static final String COL_DEPOSIT_QTY = "DEPOSIT_QTY";    		/* 入库数量*/
@@ -113,19 +120,21 @@ public class HGCG003 extends DaoEPBase {
 	private String supName = " ";		/* 供应商名称*/
 	private String purUserId = " ";		/* 采购员*/
 	private String purUserName = " ";		/* 采购员名称*/
+	private String inventType = " ";		/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
+	private Long specId = new Long(0);	/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private String material = " ";		/* 材质*/
+	private String unit = " ";		/* 单位*/
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
 	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
 	private BigDecimal deliverQty = new BigDecimal(0.000);		/* 退货数量*/
 	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.
@@ -214,6 +223,10 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn.setDescName("采购员名称");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
+		eiColumn.setDescName("存货类型");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
 		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
@@ -222,6 +235,10 @@ public class HGCG003 extends DaoEPBase {
 		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);
@@ -230,6 +247,10 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn.setDescName("材质");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_UNIT);
+		eiColumn.setDescName("单位");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_LENGTH);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -237,6 +258,20 @@ public class HGCG003 extends DaoEPBase {
 		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_RECEIVE_QTY);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -269,23 +304,6 @@ public class HGCG003 extends DaoEPBase {
 		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);
 		
 	}
 	
@@ -617,6 +635,22 @@ public class HGCG003 extends DaoEPBase {
 		this.purUserName = purUserName;
 	}
 	/**
+	 * get the inventType - 存货类型.
+	 * @return the inventType
+	 */
+	public String getInventType() {
+		return this.inventType;
+	}
+	
+	/**
+	 * set the inventType - 存货类型.
+	 *
+	 * @param inventType - 存货类型
+	 */
+	public void setInventType(String inventType) {
+		this.inventType = inventType;
+	}
+	/**
 	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
@@ -649,6 +683,22 @@ public class HGCG003 extends DaoEPBase {
 		this.inventName = inventName;
 	}
 	/**
+	 * get the specId - 规格ID.
+	 * @return the specId
+	 */
+	public Long getSpecId() {
+		return this.specId;
+	}
+	
+	/**
+	 * set the specId - 规格ID.
+	 *
+	 * @param specId - 规格ID
+	 */
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	/**
 	 * get the spec - 规格.
 	 * @return the spec
 	 */
@@ -681,6 +731,22 @@ public class HGCG003 extends DaoEPBase {
 		this.material = material;
 	}
 	/**
+	 * get the unit - 单位.
+	 * @return the unit
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	
+	/**
+	 * set the unit - 单位.
+	 *
+	 * @param unit - 单位
+	 */
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	/**
 	 * get the length - 长度.
 	 * @return the length
 	 */
@@ -697,6 +763,38 @@ public class HGCG003 extends DaoEPBase {
 		this.length = length;
 	}
 	/**
+	 * get the width - 宽度.
+	 * @return the width
+	 */
+	public BigDecimal getWidth() {
+		return this.width;
+	}
+	
+	/**
+	 * set the width - 宽度.
+	 *
+	 * @param width - 宽度
+	 */
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	/**
+	 * get the thick - 厚度.
+	 * @return the thick
+	 */
+	public BigDecimal getThick() {
+		return this.thick;
+	}
+	
+	/**
+	 * set the thick - 厚度.
+	 *
+	 * @param thick - 厚度
+	 */
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	/**
 	 * get the receiveQty - 收货数量.
 	 * @return the receiveQty
 	 */
@@ -776,31 +874,6 @@ 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.
 	 *
@@ -829,19 +902,21 @@ public class HGCG003 extends DaoEPBase {
 		setSupName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SUP_NAME)), supName));
 		setPurUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUR_USER_ID)), purUserId));
 		setPurUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUR_USER_NAME)), purUserName));
+		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		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));
+		setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
 		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));
 		setReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_QTY)), receiveQty));
 		setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
 		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));
 	}
 	
 	/**
@@ -871,19 +946,21 @@ public class HGCG003 extends DaoEPBase {
 		map.put(FIELD_SUP_NAME, StringUtils.toString(supName, eiMetadata.getMeta(FIELD_SUP_NAME)));
 		map.put(FIELD_PUR_USER_ID, StringUtils.toString(purUserId, eiMetadata.getMeta(FIELD_PUR_USER_ID)));
 		map.put(FIELD_PUR_USER_NAME, StringUtils.toString(purUserName, eiMetadata.getMeta(FIELD_PUR_USER_NAME)));
+		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		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_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
 		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_RECEIVE_QTY, StringUtils.toString(receiveQty, eiMetadata.getMeta(FIELD_RECEIVE_QTY)));
 		map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
 		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/domain/HGCG004.java

+package com.baosight.hggp.hg.cg.domain;
+
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.util.NumberUtils;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Project: <br>
+ * Title:Hgcg004.java <br>
+ * Description: <br>
+ *
+ * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
+ *
+ * @version 1.0
+ * @history 2024-05-11 16:16:46 create
+ */
+public class HGCG004 extends DaoEPBase {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String FIELD_ID = "id";
+	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_CREATED_BY = "createdBy";    		/* 记录创建者*/
+	public static final String FIELD_CREATED_NAME = "createdName";    		/* 记录创建名称*/
+	public static final String FIELD_CREATED_TIME = "createdTime";    		/* 记录创建时间*/
+	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 记录修改者*/
+	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
+	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
+	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 0-未删除，1-已删除*/
+	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 公司编码*/
+	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
+	public static final String FIELD_DEPOSIT_DATE = "depositDate";    		/* 入库日期*/
+	public static final String FIELD_DEPOSIT_NO = "depositNo";    		/* 入库单号*/
+	public static final String FIELD_RECEIVE_NO = "receiveNo";    		/* 收货单号*/
+	public static final String FIELD_PLAN_NO = "planNo";    		/* 计划单号*/
+	public static final String FIELD_CONTRACT_NO = "contractNo";    		/* 合同号*/
+	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
+	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	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_UNIT = "unit";    		/* 单位*/
+	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_DEPOSIT_QTY = "depositQty";    		/* 入库数量*/
+	public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight";    		/* 入库重量*/
+
+	public static final String COL_ID = "ID";
+	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 记录创建者*/
+	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 记录创建名称*/
+	public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 记录创建时间*/
+	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 记录修改者*/
+	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 记录修改名称*/
+	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 记录修改时间*/
+	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 0-未删除，1-已删除*/
+	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 公司编码*/
+	public static final String COL_COMPANY_NAME = "COMPANY_NAME";    		/* 公司名称*/
+	public static final String COL_DEPOSIT_DATE = "DEPOSIT_DATE";    		/* 入库日期*/
+	public static final String COL_DEPOSIT_NO = "DEPOSIT_NO";    		/* 入库单号*/
+	public static final String COL_RECEIVE_NO = "RECEIVE_NO";    		/* 收货单号*/
+	public static final String COL_PLAN_NO = "PLAN_NO";    		/* 计划单号*/
+	public static final String COL_CONTRACT_NO = "CONTRACT_NO";    		/* 合同号*/
+	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
+	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
+	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_UNIT = "UNIT";    		/* 单位*/
+	public static final String COL_LENGTH = "LENGTH";    		/* 长度*/
+	public static final String COL_WIDTH = "WIDTH";    		/* 宽度*/
+	public static final String COL_THICK = "THICK";    		/* 厚度*/
+	public static final String COL_DEPOSIT_QTY = "DEPOSIT_QTY";    		/* 入库数量*/
+	public static final String COL_DEPOSIT_WEIGHT = "DEPOSIT_WEIGHT";    		/* 入库重量*/
+
+	public static final String QUERY = "HGCG004.query";
+	public static final String COUNT = "HGCG004.count";
+	public static final String INSERT = "HGCG004.insert";
+	public static final String UPDATE = "HGCG004.update";
+	public static final String DELETE = "HGCG004.delete";
+
+	private Long id = new Long(0);
+	private String accountCode = " ";		/* 企业编码*/
+	private String depCode = " ";		/* 部门编码*/
+	private String createdBy = " ";		/* 记录创建者*/
+	private String createdName = " ";		/* 记录创建名称*/
+	private String createdTime = " ";		/* 记录创建时间*/
+	private String updatedBy = " ";		/* 记录修改者*/
+	private String updatedName = " ";		/* 记录修改名称*/
+	private String updatedTime = " ";		/* 记录修改时间*/
+	private Integer deleteFlag;	/* 0-未删除，1-已删除*/
+	private String companyCode = " ";		/* 公司编码*/
+	private String companyName = " ";		/* 公司名称*/
+	private String depositDate = " ";		/* 入库日期*/
+	private String depositNo = " ";		/* 入库单号*/
+	private String receiveNo = " ";		/* 收货单号*/
+	private String planNo = " ";		/* 计划单号*/
+	private String contractNo = " ";		/* 合同号*/
+	private String whCode = " ";		/* 仓库编码*/
+	private String whName = " ";		/* 仓库名称*/
+	private String inventType = " ";		/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
+	private Long specId = new Long(0);	/* 规格ID*/
+	private String spec = " ";		/* 规格*/
+	private String material = " ";		/* 材质*/
+	private String unit = " ";		/* 单位*/
+	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
+	private BigDecimal depositQty = new BigDecimal(0.000);		/* 入库数量*/
+	private BigDecimal depositWeight = new BigDecimal(0.000);		/* 入库重量*/
+
+	/**
+	 * initialize the metadata.
+	 */
+	public void initMetaData() {
+		EiColumn eiColumn;
+
+		eiColumn = new EiColumn(FIELD_ID);
+		eiColumn.setPrimaryKey(true);
+		eiColumn.setDescName(" ");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
+		eiColumn.setDescName("企业编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_BY);
+		eiColumn.setDescName("记录创建者");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_NAME);
+		eiColumn.setDescName("记录创建名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_TIME);
+		eiColumn.setDescName("记录创建时间");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_BY);
+		eiColumn.setDescName("记录修改者");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
+		eiColumn.setDescName("记录修改名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
+		eiColumn.setDescName("记录修改时间");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
+		eiColumn.setDescName("0-未删除，1-已删除");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
+		eiColumn.setDescName("公司编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COMPANY_NAME);
+		eiColumn.setDescName("公司名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_DATE);
+		eiColumn.setDescName("入库日期");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_NO);
+		eiColumn.setDescName("入库单号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_RECEIVE_NO);
+		eiColumn.setDescName("收货单号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PLAN_NO);
+		eiColumn.setDescName("计划单号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CONTRACT_NO);
+		eiColumn.setDescName("合同号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WH_CODE);
+		eiColumn.setDescName("仓库编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WH_NAME);
+		eiColumn.setDescName("仓库名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
+		eiColumn.setDescName("存货类型");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INVENT_CODE);
+		eiColumn.setDescName("存货编码");
+		eiMetadata.addMeta(eiColumn);
+
+		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);
+
+		eiColumn = new EiColumn(FIELD_MATERIAL);
+		eiColumn.setDescName("材质");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UNIT);
+		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_DEPOSIT_QTY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("入库数量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("入库重量");
+		eiMetadata.addMeta(eiColumn);
+
+
+	}
+
+	/**
+	 * the constructor.
+	 */
+	public HGCG004() {
+		initMetaData();
+	}
+
+	/**
+	 * get the id .
+	 * @return the id
+	 */
+	public Long getId() {
+		return this.id;
+	}
+
+	/**
+	 * set the id .
+	 *
+	 * @param id
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * get the accountCode - 企业编码.
+	 * @return the accountCode
+	 */
+	public String getAccountCode() {
+		return this.accountCode;
+	}
+
+	/**
+	 * set the accountCode - 企业编码.
+	 *
+	 * @param accountCode - 企业编码
+	 */
+	public void setAccountCode(String accountCode) {
+		this.accountCode = accountCode;
+	}
+	/**
+	 * get the depCode - 部门编码.
+	 * @return the depCode
+	 */
+	public String getDepCode() {
+		return this.depCode;
+	}
+
+	/**
+	 * set the depCode - 部门编码.
+	 *
+	 * @param depCode - 部门编码
+	 */
+	public void setDepCode(String depCode) {
+		this.depCode = depCode;
+	}
+	/**
+	 * get the createdBy - 记录创建者.
+	 * @return the createdBy
+	 */
+	public String getCreatedBy() {
+		return this.createdBy;
+	}
+
+	/**
+	 * set the createdBy - 记录创建者.
+	 *
+	 * @param createdBy - 记录创建者
+	 */
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
+	/**
+	 * get the createdName - 记录创建名称.
+	 * @return the createdName
+	 */
+	public String getCreatedName() {
+		return this.createdName;
+	}
+
+	/**
+	 * set the createdName - 记录创建名称.
+	 *
+	 * @param createdName - 记录创建名称
+	 */
+	public void setCreatedName(String createdName) {
+		this.createdName = createdName;
+	}
+	/**
+	 * get the createdTime - 记录创建时间.
+	 * @return the createdTime
+	 */
+	public String getCreatedTime() {
+		return this.createdTime;
+	}
+
+	/**
+	 * set the createdTime - 记录创建时间.
+	 *
+	 * @param createdTime - 记录创建时间
+	 */
+	public void setCreatedTime(String createdTime) {
+		this.createdTime = createdTime;
+	}
+	/**
+	 * get the updatedBy - 记录修改者.
+	 * @return the updatedBy
+	 */
+	public String getUpdatedBy() {
+		return this.updatedBy;
+	}
+
+	/**
+	 * set the updatedBy - 记录修改者.
+	 *
+	 * @param updatedBy - 记录修改者
+	 */
+	public void setUpdatedBy(String updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+	/**
+	 * get the updatedName - 记录修改名称.
+	 * @return the updatedName
+	 */
+	public String getUpdatedName() {
+		return this.updatedName;
+	}
+
+	/**
+	 * set the updatedName - 记录修改名称.
+	 *
+	 * @param updatedName - 记录修改名称
+	 */
+	public void setUpdatedName(String updatedName) {
+		this.updatedName = updatedName;
+	}
+	/**
+	 * get the updatedTime - 记录修改时间.
+	 * @return the updatedTime
+	 */
+	public String getUpdatedTime() {
+		return this.updatedTime;
+	}
+
+	/**
+	 * set the updatedTime - 记录修改时间.
+	 *
+	 * @param updatedTime - 记录修改时间
+	 */
+	public void setUpdatedTime(String updatedTime) {
+		this.updatedTime = updatedTime;
+	}
+	/**
+	 * get the deleteFlag - 0-未删除，1-已删除.
+	 * @return the deleteFlag
+	 */
+	public Integer getDeleteFlag() {
+		return this.deleteFlag;
+	}
+
+	/**
+	 * set the deleteFlag - 0-未删除，1-已删除.
+	 *
+	 * @param deleteFlag - 0-未删除，1-已删除
+	 */
+	public void setDeleteFlag(Integer deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
+	/**
+	 * get the companyCode - 公司编码.
+	 * @return the companyCode
+	 */
+	public String getCompanyCode() {
+		return this.companyCode;
+	}
+
+	/**
+	 * set the companyCode - 公司编码.
+	 *
+	 * @param companyCode - 公司编码
+	 */
+	public void setCompanyCode(String companyCode) {
+		this.companyCode = companyCode;
+	}
+	/**
+	 * get the companyName - 公司名称.
+	 * @return the companyName
+	 */
+	public String getCompanyName() {
+		return this.companyName;
+	}
+
+	/**
+	 * set the companyName - 公司名称.
+	 *
+	 * @param companyName - 公司名称
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+	/**
+	 * get the depositDate - 入库日期.
+	 * @return the depositDate
+	 */
+	public String getDepositDate() {
+		return this.depositDate;
+	}
+
+	/**
+	 * set the depositDate - 入库日期.
+	 *
+	 * @param depositDate - 入库日期
+	 */
+	public void setDepositDate(String depositDate) {
+		this.depositDate = depositDate;
+	}
+	/**
+	 * get the depositNo - 入库单号.
+	 * @return the depositNo
+	 */
+	public String getDepositNo() {
+		return this.depositNo;
+	}
+
+	/**
+	 * set the depositNo - 入库单号.
+	 *
+	 * @param depositNo - 入库单号
+	 */
+	public void setDepositNo(String depositNo) {
+		this.depositNo = depositNo;
+	}
+	/**
+	 * get the receiveNo - 收货单号.
+	 * @return the receiveNo
+	 */
+	public String getReceiveNo() {
+		return this.receiveNo;
+	}
+
+	/**
+	 * set the receiveNo - 收货单号.
+	 *
+	 * @param receiveNo - 收货单号
+	 */
+	public void setReceiveNo(String receiveNo) {
+		this.receiveNo = receiveNo;
+	}
+	/**
+	 * get the planNo - 计划单号.
+	 * @return the planNo
+	 */
+	public String getPlanNo() {
+		return this.planNo;
+	}
+
+	/**
+	 * set the planNo - 计划单号.
+	 *
+	 * @param planNo - 计划单号
+	 */
+	public void setPlanNo(String planNo) {
+		this.planNo = planNo;
+	}
+	/**
+	 * get the contractNo - 合同号.
+	 * @return the contractNo
+	 */
+	public String getContractNo() {
+		return this.contractNo;
+	}
+
+	/**
+	 * set the contractNo - 合同号.
+	 *
+	 * @param contractNo - 合同号
+	 */
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	/**
+	 * get the whCode - 仓库编码.
+	 * @return the whCode
+	 */
+	public String getWhCode() {
+		return this.whCode;
+	}
+
+	/**
+	 * set the whCode - 仓库编码.
+	 *
+	 * @param whCode - 仓库编码
+	 */
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+	/**
+	 * get the whName - 仓库名称.
+	 * @return the whName
+	 */
+	public String getWhName() {
+		return this.whName;
+	}
+
+	/**
+	 * set the whName - 仓库名称.
+	 *
+	 * @param whName - 仓库名称
+	 */
+	public void setWhName(String whName) {
+		this.whName = whName;
+	}
+	/**
+	 * get the inventType - 存货类型.
+	 * @return the inventType
+	 */
+	public String getInventType() {
+		return this.inventType;
+	}
+
+	/**
+	 * set the inventType - 存货类型.
+	 *
+	 * @param inventType - 存货类型
+	 */
+	public void setInventType(String inventType) {
+		this.inventType = inventType;
+	}
+	/**
+	 * get the inventCode - 存货编码.
+	 * @return the inventCode
+	 */
+	public String getInventCode() {
+		return this.inventCode;
+	}
+
+	/**
+	 * set the inventCode - 存货编码.
+	 *
+	 * @param inventCode - 存货编码
+	 */
+	public void setInventCode(String inventCode) {
+		this.inventCode = inventCode;
+	}
+	/**
+	 * get the inventName - 存货名称.
+	 * @return the inventName
+	 */
+	public String getInventName() {
+		return this.inventName;
+	}
+
+	/**
+	 * set the inventName - 存货名称.
+	 *
+	 * @param inventName - 存货名称
+	 */
+	public void setInventName(String inventName) {
+		this.inventName = inventName;
+	}
+	/**
+	 * get the specId - 规格ID.
+	 * @return the specId
+	 */
+	public Long getSpecId() {
+		return this.specId;
+	}
+
+	/**
+	 * set the specId - 规格ID.
+	 *
+	 * @param specId - 规格ID
+	 */
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	/**
+	 * get the spec - 规格.
+	 * @return the spec
+	 */
+	public String getSpec() {
+		return this.spec;
+	}
+
+	/**
+	 * set the spec - 规格.
+	 *
+	 * @param spec - 规格
+	 */
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+	/**
+	 * get the material - 材质.
+	 * @return the material
+	 */
+	public String getMaterial() {
+		return this.material;
+	}
+
+	/**
+	 * set the material - 材质.
+	 *
+	 * @param material - 材质
+	 */
+	public void setMaterial(String material) {
+		this.material = material;
+	}
+	/**
+	 * get the unit - 单位.
+	 * @return the unit
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+
+	/**
+	 * set the unit - 单位.
+	 *
+	 * @param unit - 单位
+	 */
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	/**
+	 * get the length - 长度.
+	 * @return the length
+	 */
+	public BigDecimal getLength() {
+		return this.length;
+	}
+
+	/**
+	 * set the length - 长度.
+	 *
+	 * @param length - 长度
+	 */
+	public void setLength(BigDecimal length) {
+		this.length = length;
+	}
+	/**
+	 * get the width - 宽度.
+	 * @return the width
+	 */
+	public BigDecimal getWidth() {
+		return this.width;
+	}
+
+	/**
+	 * set the width - 宽度.
+	 *
+	 * @param width - 宽度
+	 */
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	/**
+	 * get the thick - 厚度.
+	 * @return the thick
+	 */
+	public BigDecimal getThick() {
+		return this.thick;
+	}
+
+	/**
+	 * set the thick - 厚度.
+	 *
+	 * @param thick - 厚度
+	 */
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	/**
+	 * get the depositQty - 入库数量.
+	 * @return the depositQty
+	 */
+	public BigDecimal getDepositQty() {
+		return this.depositQty;
+	}
+
+	/**
+	 * set the depositQty - 入库数量.
+	 *
+	 * @param depositQty - 入库数量
+	 */
+	public void setDepositQty(BigDecimal depositQty) {
+		this.depositQty = depositQty;
+	}
+	/**
+	 * get the depositWeight - 入库重量.
+	 * @return the depositWeight
+	 */
+	public BigDecimal getDepositWeight() {
+		return this.depositWeight;
+	}
+
+	/**
+	 * set the depositWeight - 入库重量.
+	 *
+	 * @param depositWeight - 入库重量
+	 */
+	public void setDepositWeight(BigDecimal depositWeight) {
+		this.depositWeight = depositWeight;
+	}
+	/**
+	 * get the value from Map.
+	 *
+	 * @param map - source data map
+	 */
+	@Override
+	public void fromMap(Map map) {
+
+		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
+		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
+		setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
+		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
+		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
+		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
+		setDepositDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_DATE)), depositDate));
+		setDepositNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_NO)), depositNo));
+		setReceiveNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIVE_NO)), receiveNo));
+		setPlanNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_NO)), planNo));
+		setContractNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NO)), contractNo));
+		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
+		setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
+		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
+		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));
+		setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
+		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));
+		setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty));
+		setDepositWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_WEIGHT)), depositWeight));
+	}
+
+	/**
+	 * set the value to Map.
+	 */
+	@Override
+	public Map toMap() {
+
+		Map map = new HashMap();
+		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
+		map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
+		map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
+		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
+		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
+		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
+		map.put(FIELD_DEPOSIT_DATE, StringUtils.toString(depositDate, eiMetadata.getMeta(FIELD_DEPOSIT_DATE)));
+		map.put(FIELD_DEPOSIT_NO, StringUtils.toString(depositNo, eiMetadata.getMeta(FIELD_DEPOSIT_NO)));
+		map.put(FIELD_RECEIVE_NO, StringUtils.toString(receiveNo, eiMetadata.getMeta(FIELD_RECEIVE_NO)));
+		map.put(FIELD_PLAN_NO, StringUtils.toString(planNo, eiMetadata.getMeta(FIELD_PLAN_NO)));
+		map.put(FIELD_CONTRACT_NO, StringUtils.toString(contractNo, eiMetadata.getMeta(FIELD_CONTRACT_NO)));
+		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
+		map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
+		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
+		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_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
+		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_DEPOSIT_QTY, StringUtils.toString(depositQty, eiMetadata.getMeta(FIELD_DEPOSIT_QTY)));
+		map.put(FIELD_DEPOSIT_WEIGHT, StringUtils.toString(depositWeight, eiMetadata.getMeta(FIELD_DEPOSIT_WEIGHT)));
+
+		return map;
+	}
+}

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

@@ -230,7 +230,7 @@ public class ServiceHGCG001 extends ServiceBase {
 	 */
 	private void submitData(List<HGCG001> fCg001s) {
 		for (HGCG001 fCg001 : fCg001s) {
-			fCg001.setStatus(HGConstant.CgPlanStatus.S_1);
+			fCg001.setStatus(HGConstant.CgPlanStatus.S_2);
 			fCg001.setAuditTime(DateUtils.shortDateTime());
 			fCg001.setAuditUserId(UserSessionUtils.getLoginName());
 			fCg001.setAuditUserName(UserSessionUtils.getLoginCName());

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

@@ -178,7 +178,7 @@ public class ServiceHGCG002 extends ServiceBase {
 			dbCg002.setDeleteFlag(DeleteFlagEnum.REMOVE.getCode());
 			DaoUtils.update(HGCG002.DELETE, dbCg002);
 			// 更新计划状态
-			HGCGTools.HgCg001.updateStatus(dbCg002.getPlanNo(), HGConstant.CgPlanStatus.S_1);
+			HGCGTools.HgCg001.updateStatus(dbCg002.getPlanNo(), HGConstant.CgPlanStatus.S_2);
 		}
 	}
 	
@@ -231,7 +231,7 @@ public class ServiceHGCG002 extends ServiceBase {
 	 */
 	private void submitData(List<HGCG002> fCg002s) {
 		for (HGCG002 fCg002 : fCg002s) {
-			fCg002.setStatus(HGConstant.CgContractStatus.S_1);
+			fCg002.setStatus(HGConstant.CgContractStatus.S_2);
 			fCg002.setAuditTime(DateUtils.shortDateTime());
 			fCg002.setAuditUserId(UserSessionUtils.getLoginName());
 			fCg002.setAuditUserName(UserSessionUtils.getLoginCName());

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

@@ -67,7 +67,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 			HgCgUtils.HgCg001.setCondition(queryRow);
 			// 仅审核通过
-			queryRow.put(HGCG001.FIELD_STATUS, HGConstant.CgPlanStatus.S_1);
+			queryRow.put(HGCG001.FIELD_STATUS, HGConstant.CgPlanStatus.S_2);
 			inInfo = super.query(inInfo, HGCG001.QUERY, new HGCG001());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -112,7 +112,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			String planNo = fCg001.getPlanNo();
 			HGCG001 dbCg001 = dbCg001Map.get(planNo);
 			AssertUtils.isNull(dbCg001, String.format("计划[%s]不存在", planNo));
-			AssertUtils.isNotEquals(HGConstant.CgPlanStatus.S_1, dbCg001.getStatus(),
+			AssertUtils.isNotEquals(HGConstant.CgPlanStatus.S_2, dbCg001.getStatus(),
 					String.format("计划[%s]状态不是\"审核通过\"，不允许操作", planNo));
 		}
 	}
@@ -136,7 +136,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			newCg002.setDeleteFlag(DeleteFlagEnum.UN_REMOVE.getCode());
 			DaoUtils.insert(HGCG002.INSERT, newCg002);
 			// 更新计划状态
-			HGCGTools.HgCg001.updateStatus(planNo, HGConstant.CgPlanStatus.S_3);
+			HGCGTools.HgCg001.updateStatus(planNo, HGConstant.CgPlanStatus.S_4);
 		}
 	}
 	

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

@@ -259,7 +259,7 @@ public class ServiceHGCG003 extends ServiceBase {
 	 */
 	private void confirmData(List<HGCG003> fCg003s) {
 		for (HGCG003 fCg003 : fCg003s) {
-			fCg003.setStatus(HGConstant.CgReceiveStatus.S_1);
+			fCg003.setStatus(HGConstant.CgReceiveStatus.S_2);
 			DaoUtils.update(HGSqlConstant.HgCg003.UPDATE_STATUS, fCg003);
 		}
 	}

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

@@ -24,7 +24,6 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -69,7 +68,7 @@ public class ServiceHGCG003A extends ServiceBase {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 			HgCgUtils.HgCg001.setCondition(queryRow);
 			// 仅审核通过和收货中
-			queryRow.put("statuses", new Integer[]{HGConstant.CgContractStatus.S_1, HGConstant.CgContractStatus.S_3});
+			queryRow.put("statuses", new Integer[]{HGConstant.CgContractStatus.S_2, HGConstant.CgContractStatus.S_4});
 			inInfo = super.query(inInfo, HGCG002.QUERY, new HGCG002A());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -114,8 +113,8 @@ public class ServiceHGCG003A extends ServiceBase {
 			String contractNo = fCg002A.getContractNo();
 			HGCG002A dbCg002A = dbCg002AMap.get(contractNo);
 			AssertUtils.isNull(dbCg002A, String.format("合同[%s]不存在", contractNo));
-			AssertUtils.isTrue(!(HGConstant.CgContractStatus.S_1.equals(dbCg002A.getStatus())
-							|| HGConstant.CgContractStatus.S_3.equals(dbCg002A.getStatus())),
+			AssertUtils.isTrue(!(HGConstant.CgContractStatus.S_2.equals(dbCg002A.getStatus())
+							|| HGConstant.CgContractStatus.S_4.equals(dbCg002A.getStatus())),
 					String.format("合同[%s]状态不是\"审核通过\"或\"收货中\"，不允许操作", contractNo));
 			AssertUtils.isGt(fCg002A.getBcReceiveQty(), dbCg002A.getBcMaxReceiveQty(),
 					String.format("合同[%s]本次收货数量(%s)不能大于本次最大收货数量(%s)", contractNo,
@@ -137,6 +136,7 @@ public class ServiceHGCG003A extends ServiceBase {
 			newCg003.setReceiveDate(DateUtils.shortDate());
 			newCg003.setReceiveNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.CG_RECEIVE_NO));
 			newCg003.setReceiveQty(fCg002A.getBcReceiveQty());
+			newCg003.setReceiveWeight(fCg002A.getPurWeight());
 			newCg003.setStatus(HGConstant.CgReceiveStatus.S_0);
 			newCg003.setDeleteFlag(DeleteFlagEnum.UN_REMOVE.getCode());
 			DaoUtils.insert(HGCG003.INSERT, newCg003);

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

@@ -12,15 +12,22 @@
         UPDATED_BY as "updatedBy",  <!-- 记录修改者 -->
         UPDATED_NAME as "updatedName",  <!-- 记录修改名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 记录修改时间 -->
+        DELETE_FLAG as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
         COMPANY_CODE as "companyCode",  <!-- 公司编码 -->
         COMPANY_NAME as "companyName",  <!-- 公司名称 -->
         PLAN_DATE as "planDate",  <!-- 计划日期 -->
         PLAN_NO as "planNo",  <!-- 计划单号 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
         INVENT_CODE as "inventCode",  <!-- 存货编码 -->
         INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
         SPEC as "spec",  <!-- 规格 -->
         MATERIAL as "material",  <!-- 材质 -->
+        UNIT as "unit",  <!-- 单位 -->
         LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
+        PLAN_QTY as "planQty",  <!-- 计划数量 -->
         PLAN_WEIGHT as "planWeight",  <!-- 计划重量 -->
         PUR_QTY as "purQty",  <!-- 采购数量 -->
         PUR_WEIGHT as "purWeight",  <!-- 采购重量 -->
@@ -28,39 +35,20 @@
         AUDIT_TIME as "auditTime",  <!-- 审核时间 -->
         AUDIT_USER_ID as "auditUserId",  <!-- 审核人ID -->
         AUDIT_USER_NAME as "auditUserName",  <!-- 审核人名称 -->
-        AUDIT_REASON as "auditReason", <!-- 审核原因 -->
-        SPEC_ID as "specId",    <!-- 规格ID -->
-        WIDTH as "width",  <!-- 宽度 -->
-        THICK as "thick"  <!-- 厚度 -->
+        AUDIT_REASON as "auditReason" <!-- 审核原因 -->
     </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">
-			ID = #id#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountCode">
 			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdBy">
-			CREATED_BY = #createdBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdName">
-			CREATED_NAME = #createdName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedBy">
-			UPDATED_BY = #updatedBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedName">
-			UPDATED_NAME = #updatedName#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
@@ -76,12 +64,6 @@
 		<isNotEmpty prepend=" AND " property="inventName">
 			INVENT_NAME = #inventName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="spec">
-			SPEC = #spec#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="material">
-			MATERIAL = #material#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#
 		</isNotEmpty>
@@ -94,6 +76,9 @@
 	</sql>
 
     <sql id="idCondition">
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="planNo">
             PLAN_NO = #planNo#
         </isNotEmpty>
@@ -103,12 +88,8 @@
     </sql>
 
     <sql id="customCondition">
-        <isNotEmpty prepend=" AND " property="createdTimeFrom">
-            CREATED_TIME &gt;= #createdTimeFrom#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTimeTo">
-            CREATED_TIME &lt;= #createdTimeTo#
-        </isNotEmpty>
+        <include refid="BaseCondition.specCondition"/>
+        <include refid="BaseCondition.createdTimeCondition"/>
     </sql>
 
     <!-- 公共修改字段 -->
@@ -156,15 +137,21 @@
         PLAN_NO,  <!-- 计划单号 -->
         INVENT_CODE,  <!-- 存货编码 -->
         INVENT_NAME,  <!-- 存货名称 -->
+        SPEC_ID,  <!-- 规格ID -->
         SPEC,  <!-- 规格 -->
         MATERIAL,  <!-- 材质 -->
+        UNIT,  <!-- 单位 -->
         LENGTH,  <!-- 长度 -->
+        WIDTH,  <!-- 宽度 -->
+        THICK,  <!-- 厚度 -->
+        PLAN_QTY,  <!-- 计划数量 -->
         PLAN_WEIGHT,  <!-- 计划重量 -->
         STATUS  <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #companyCode#, #companyName#, #planDate#, #planNo#, #inventCode#, #inventName#,
-        #spec#, #material#, #length#, #planWeight#, #status#
+        #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#,
+        #planQty#, #planWeight#, #status#
         )
     </insert>
 

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

@@ -22,11 +22,16 @@
         SUP_NAME as "supName",  <!-- 供应商名称 -->
         PUR_USER_ID as "purUserId",  <!-- 采购员 -->
         PUR_USER_NAME as "purUserName",  <!-- 采购员名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
         INVENT_CODE as "inventCode",  <!-- 存货编码 -->
         INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
         SPEC as "spec",  <!-- 规格 -->
         MATERIAL as "material",  <!-- 材质 -->
+        UNIT as "unit",  <!-- 单位 -->
         LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
         PUR_QTY as "purQty",  <!-- 采购数量 -->
         PUR_WEIGHT as "purWeight",  <!-- 采购重量 -->
         RECEIVE_QTY as "receiveQty",  <!-- 收货数量 -->
@@ -34,10 +39,7 @@
         AUDIT_TIME as "auditTime",  <!-- 审核时间 -->
         AUDIT_USER_ID as "auditUserId",  <!-- 审核人ID -->
         AUDIT_USER_NAME as "auditUserName",  <!-- 审核人名称 -->
-        AUDIT_REASON as "auditReason", <!-- 审核原因 -->
-        SPEC_ID as "specId",    <!-- 规格ID -->
-        WIDTH as "width",  <!-- 宽度 -->
-        THICK as "thick"  <!-- 厚度 -->
+        AUDIT_REASON as "auditReason" <!-- 审核原因 -->
     </sql>
 
     <sql id="qtyColumn">
@@ -47,36 +49,14 @@
     <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">
-            ID = #id#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="depCode">
             DEP_CODE = #depCode#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdBy">
-            CREATED_BY = #createdBy#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdName">
-            CREATED_NAME = #createdName#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTime">
-            CREATED_TIME = #createdTime#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedBy">
-            UPDATED_BY = #updatedBy#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedName">
-            UPDATED_NAME = #updatedName#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedTime">
-            UPDATED_TIME = #updatedTime#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="companyCode">
             COMPANY_CODE = #companyCode#
         </isNotEmpty>
@@ -107,21 +87,9 @@
         <isNotEmpty prepend=" AND " property="inventName">
             INVENT_NAME = #inventName#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="spec">
-            SPEC = #spec#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="material">
             MATERIAL = #material#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="length">
-            LENGTH = #length#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="purQty">
-            PUR_QTY = #purQty#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="purWeight">
-            PUR_WEIGHT = #purWeight#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="status">
             STATUS = #status#
         </isNotEmpty>
@@ -134,12 +102,12 @@
         <isNotEmpty prepend=" AND " property="auditUserName">
             AUDIT_USER_NAME = #auditUserName#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="auditReason">
-            AUDIT_REASON = #auditReason#
-        </isNotEmpty>
     </sql>
 
     <sql id="idCondition">
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="contractNo">
             CONTRACT_NO = #contractNo#
         </isNotEmpty>
@@ -149,11 +117,10 @@
     </sql>
 
     <sql id="customCondition">
-        <isNotEmpty prepend=" AND " property="createdTimeFrom">
-            CREATED_TIME &gt;= #createdTimeFrom#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTimeTo">
-            CREATED_TIME &lt;= #createdTimeTo#
+        <include refid="BaseCondition.specCondition"/>
+        <include refid="BaseCondition.createdTimeCondition"/>
+        <isNotEmpty prepend=" AND " property="statuses">
+            STATUS IN <iterate open="(" close=")" conjunction="," property="statuses">#statuses[]#</iterate>
         </isNotEmpty>
     </sql>
 
@@ -204,16 +171,20 @@
         PLAN_NO,  <!-- 计划单号 -->
         INVENT_CODE,  <!-- 存货编码 -->
         INVENT_NAME,  <!-- 存货名称 -->
-        SPEC,  <!-- 规格 -->
-        MATERIAL,  <!-- 材质 -->
-        LENGTH,  <!-- 长度 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
+        SPEC as "spec",  <!-- 规格 -->
+        MATERIAL as "material",  <!-- 材质 -->
+        UNIT as "unit",  <!-- 单位 -->
+        LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
         PUR_QTY,  <!-- 采购数量 -->
         PUR_WEIGHT,  <!-- 采购重量 -->
         STATUS  <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #contractDate#, #contractNo#, #planNo#,
-        #inventCode#, #inventName#, #spec#, #material#, #length#,
+        #inventCode#, #inventName#, #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#,
         #purQty#, #purWeight#, #status#
         )
     </insert>

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

@@ -23,54 +23,34 @@
         SUP_NAME as "supName",  <!-- 供应商名称 -->
         PUR_USER_ID as "purUserId",  <!-- 采购员 -->
         PUR_USER_NAME as "purUserName",  <!-- 采购员名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
         INVENT_CODE as "inventCode",  <!-- 存货编码 -->
         INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
         SPEC as "spec",  <!-- 规格 -->
         MATERIAL as "material",  <!-- 材质 -->
+        UNIT as "unit",  <!-- 单位 -->
         LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
         RECEIVE_QTY as "receiveQty",  <!-- 收货数量 -->
         DELIVER_QTY as "deliverQty",  <!-- 退货数量 -->
         DEPOSIT_QTY as "depositQty",  <!-- 入库数量 -->
         RECEIVE_WEIGHT as "receiveWeight",  <!-- 收货重量 -->
-        STATUS as "status", <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
-        SPEC_ID as "specId",    <!-- 规格ID -->
-        WIDTH as "width",  <!-- 宽度 -->
-        THICK as "thick"  <!-- 厚度 -->
+        STATUS as "status" <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
     </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">
-            ID = #id#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="depCode">
             DEP_CODE = #depCode#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdBy">
-            CREATED_BY = #createdBy#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdName">
-            CREATED_NAME = #createdName#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTime">
-            CREATED_TIME = #createdTime#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedBy">
-            UPDATED_BY = #updatedBy#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedName">
-            UPDATED_NAME = #updatedName#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="updatedTime">
-            UPDATED_TIME = #updatedTime#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
@@ -107,33 +87,18 @@
         <isNotEmpty prepend=" AND " property="inventName">
             INVENT_NAME = #inventName#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="spec">
-            SPEC = #spec#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="material">
             MATERIAL = #material#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="length">
-            LENGTH = #length#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="receiveQty">
-            RECEIVE_QTY = #receiveQty#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="deliverQty">
-            DELIVER_QTY = #deliverQty#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="depositQty">
-            DEPOSIT_QTY = #depositQty#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="receiveWeight">
-            RECEIVE_WEIGHT = #receiveWeight#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="status">
             STATUS = #status#
         </isNotEmpty>
     </sql>
 
     <sql id="idCondition">
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="receiveNo">
             RECEIVE_NO = #receiveNo#
         </isNotEmpty>
@@ -143,12 +108,8 @@
     </sql>
 
     <sql id="customCondition">
-        <isNotEmpty prepend=" AND " property="createdTimeFrom">
-            CREATED_TIME &gt;= #createdTimeFrom#
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTimeTo">
-            CREATED_TIME &lt;= #createdTimeTo#
-        </isNotEmpty>
+        <include refid="BaseCondition.specCondition"/>
+        <include refid="BaseCondition.createdTimeCondition"/>
     </sql>
 
     <!-- 公共修改字段 -->
@@ -200,11 +161,16 @@
         SUP_NAME,  <!-- 供应商名称 -->
         PUR_USER_ID,  <!-- 采购员 -->
         PUR_USER_NAME,  <!-- 采购员名称 -->
+        INVENT_TYPE,  <!-- 存货类型 -->
         INVENT_CODE,  <!-- 存货编码 -->
         INVENT_NAME,  <!-- 存货名称 -->
+        SPEC_ID,  <!-- 规格ID -->
         SPEC,  <!-- 规格 -->
         MATERIAL,  <!-- 材质 -->
+        UNIT,  <!-- 单位 -->
         LENGTH,  <!-- 长度 -->
+        WIDTH,  <!-- 宽度 -->
+        THICK,  <!-- 厚度 -->
         RECEIVE_QTY,  <!-- 收货数量 -->
         RECEIVE_WEIGHT,  <!-- 收货重量 -->
         STATUS  <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
@@ -212,8 +178,8 @@
             #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
             #deleteFlag#, #companyCode#, #companyName#, #receiveDate#, #receiveNo#,
             #planNo#, #contractNo#, #supCode#, #supName#, #purUserId#, #purUserName#,
-            #inventCode#, #inventName#, #spec#, #material#, #length#,
-            #receiveQty#, #receiveWeight#, #status#
+            #inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#,
+            #unit#, #length#, #width#, #thick#, #receiveQty#, #receiveWeight#, #status#
         )
     </insert>
 

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG004.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="HGCG004">
+
+    <sql id="column">
+        ID as "id",
+        ACCOUNT_CODE as "accountCode",  <!-- 企业编码 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 -->
+        CREATED_BY as "createdBy",  <!-- 记录创建者 -->
+        CREATED_NAME as "createdName",  <!-- 记录创建名称 -->
+        CREATED_TIME as "createdTime",  <!-- 记录创建时间 -->
+        UPDATED_BY as "updatedBy",  <!-- 记录修改者 -->
+        UPDATED_NAME as "updatedName",  <!-- 记录修改名称 -->
+        UPDATED_TIME as "updatedTime",  <!-- 记录修改时间 -->
+        DELETE_FLAG as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
+        COMPANY_CODE as "companyCode",  <!-- 公司编码 -->
+        COMPANY_NAME as "companyName",  <!-- 公司名称 -->
+        DEPOSIT_DATE as "depositDate",  <!-- 入库日期 -->
+        DEPOSIT_NO as "depositNo",  <!-- 入库单号 -->
+        RECEIVE_NO as "receiveNo",  <!-- 收货单号 -->
+        PLAN_NO as "planNo",  <!-- 计划单号 -->
+        CONTRACT_NO as "contractNo",  <!-- 合同号 -->
+        WH_CODE as "whCode",  <!-- 仓库编码 -->
+        WH_NAME as "whName",  <!-- 仓库名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
+        SPEC as "spec",  <!-- 规格 -->
+        MATERIAL as "material",  <!-- 材质 -->
+        UNIT as "unit",  <!-- 单位 -->
+        LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
+        DEPOSIT_QTY as "depositQty",  <!-- 入库数量 -->
+        DEPOSIT_WEIGHT as "depositWeight" <!-- 入库重量 -->
+    </sql>
+
+    <sql id="condition">
+        AND DELETE_FLAG = 0
+        <include refid="HGXSDataAuth.authCondition"/>
+        <include refid="idCondition"/>
+        <include refid="customCondition"/>
+        <isNotEmpty prepend=" AND " property="accountCode">
+            ACCOUNT_CODE = #accountCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depCode">
+            DEP_CODE = #depCode#
+        </isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deleteFlag">
+			DELETE_FLAG = #deleteFlag#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME = #companyName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depositDate">
+			DEPOSIT_DATE = #depositDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="receiveNo">
+			RECEIVE_NO = #receiveNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="planNo">
+			PLAN_NO = #planNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNo">
+			CONTRACT_NO = #contractNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whCode">
+			WH_CODE = #whCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whName">
+			WH_NAME = #whName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventCode">
+			INVENT_CODE = #inventCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventName">
+			INVENT_NAME = #inventName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="specId">
+			SPEC_ID = #specId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="material">
+			MATERIAL = #material#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="unit">
+			UNIT = #unit#
+		</isNotEmpty>
+	</sql>
+
+    <sql id="idCondition">
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depositNo">
+            DEPOSIT_NO = #depositNo#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depositNos">
+            DEPOSIT_NO IN <iterate open="(" close=")" conjunction="," property="depositNos">#depositNos[]#</iterate>
+        </isNotEmpty>
+    </sql>
+
+    <sql id="customCondition">
+        <include refid="BaseCondition.specCondition"/>
+        <include refid="BaseCondition.createdTimeCondition"/>
+    </sql>
+
+    <!-- 公共修改字段 -->
+    <sql id="updateRevise">
+        UPDATED_BY = #updatedBy#,
+        UPDATED_NAME = #updatedName#,
+        UPDATED_TIME = #updatedTime#
+    </sql>
+
+    <sql id="orderBy">
+        <dynamic prepend="ORDER BY">
+            <isNotEmpty property="orderBy">
+                $orderBy$
+            </isNotEmpty>
+            <isEmpty property="orderBy">
+                ID asc
+            </isEmpty>
+        </dynamic>
+    </sql>
+
+    <select id="query" resultClass="com.baosight.hggp.hg.cg.domain.HGCG004">
+        SELECT
+        <include refid="column"/>
+        FROM ${hggpSchema}.HGCG004
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="orderBy"/>
+    </select>
+
+    <select id="count" resultClass="int">
+        SELECT COUNT(*) FROM ${hggpSchema}.HGCG004 WHERE 1=1
+        <include refid="condition"/>
+    </select>
+
+    <insert id="insert">
+        INSERT INTO ${hggpSchema}.HGCG004 (
+        ACCOUNT_CODE,  <!-- 企业编码 -->
+        DEP_CODE,  <!-- 部门编码 -->
+        CREATED_BY,  <!-- 记录创建者 -->
+        CREATED_NAME,  <!-- 记录创建名称 -->
+        CREATED_TIME,  <!-- 记录创建时间 -->
+        DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
+        COMPANY_CODE,  <!-- 公司编码 -->
+        COMPANY_NAME,  <!-- 公司名称 -->
+        DEPOSIT_DATE,  <!-- 入库日期 -->
+        DEPOSIT_NO,  <!-- 入库单号 -->
+        RECEIVE_NO,  <!-- 收货单号 -->
+        PLAN_NO,  <!-- 计划单号 -->
+        CONTRACT_NO,  <!-- 合同号 -->
+        WH_CODE,  <!-- 仓库编码 -->
+        WH_NAME,  <!-- 仓库名称 -->
+        INVENT_TYPE,  <!-- 存货类型 -->
+        INVENT_CODE,  <!-- 存货编码 -->
+        INVENT_NAME,  <!-- 存货名称 -->
+        SPEC_ID,  <!-- 规格ID -->
+        SPEC,  <!-- 规格 -->
+        MATERIAL,  <!-- 材质 -->
+        UNIT,  <!-- 单位 -->
+        LENGTH,  <!-- 长度 -->
+        WIDTH,  <!-- 宽度 -->
+        THICK,  <!-- 厚度 -->
+        DEPOSIT_QTY,  <!-- 入库数量 -->
+        DEPOSIT_WEIGHT  <!-- 入库重量 -->
+        ) VALUES (
+        #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
+        #deleteFlag#, #companyCode#, #companyName#, #depositDate#, #depositNo#,
+        #receiveNo#, #planNo#, #contractNo#, #whCode#, #whName#, #inventType#,
+        #inventCode#, #inventName#, #specId#, #spec#, #material#,
+        #unit#, #length#, #width#, #thick#, #depositQty#, #depositWeight#
+        )
+    </insert>
+
+    <delete id="delete">
+        UPDATE ${hggpSchema}.HGCG004
+        SET
+        DELETE_FLAG = #deleteFlag#,
+        <include refid="updateRevise"/>
+        WHERE DEPOSIT_NO = #depositNo#
+    </delete>
+
+</sqlMap>

src/main/java/com/baosight/hggp/hg/cg/tools/HGCGTools.java

@@ -135,8 +135,8 @@ public class HGCGTools {
 			AssertUtils.isNull(dbCg002, "合同号不能为空！");
 			AssertUtils.isNull(receiveQty, "收货数量不能为空！");
 			BigDecimal diffQty = dbCg002.getPurQty().subtract(receiveQty.add(dbCg002.getReceiveQty()));
-			Integer status = diffQty.compareTo(BigDecimal.ZERO) == 0 ? HGConstant.CgContractStatus.S_4
-					: HGConstant.CgContractStatus.S_3;
+			Integer status = diffQty.compareTo(BigDecimal.ZERO) == 0 ? HGConstant.CgContractStatus.S_5
+					: HGConstant.CgContractStatus.S_4;
 			Map<String, Object> paramMap = new HashMap<>();
 			paramMap.put(HGCG002.FIELD_CONTRACT_NO, dbCg002.getContractNo());
 			paramMap.put(HGCG002.FIELD_STATUS, status);

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -107,12 +107,14 @@ public class HGConstant {
 		
 		// 待审核
 		public static final Integer S_0 = 0;
-		// 审核通过
+		// 审核中
 		public static final Integer S_1 = 1;
-		// 审核拒绝
+		// 审核通过
 		public static final Integer S_2 = 2;
-		// 生成合同
+		// 审核拒绝
 		public static final Integer S_3 = 3;
+		// 生成合同
+		public static final Integer S_4 = 4;
 	}
 	
 	/**
@@ -125,14 +127,16 @@ public class HGConstant {
 		
 		// 待审核
 		public static final Integer S_0 = 0;
-		// 审核通过
+		// 审核中
 		public static final Integer S_1 = 1;
-		// 审核拒绝
+		// 审核通过
 		public static final Integer S_2 = 2;
-		// 收货中
+		// 审核拒绝
 		public static final Integer S_3 = 3;
-		// 收货完成
+		// 收货中
 		public static final Integer S_4 = 4;
+		// 收货完成
+		public static final Integer S_5 = 5;
 	}
 
 	/**
@@ -146,13 +150,13 @@ public class HGConstant {
 		// 待确认
 		public static final Integer S_0 = 0;
 		// 已收货
-		public static final Integer S_1 = 1;
-		// 质检中
 		public static final Integer S_2 = 2;
-		// 质检完成
+		// 质检中
 		public static final Integer S_3 = 3;
-		// 已入库
+		// 质检完成
 		public static final Integer S_4 = 4;
+		// 已入库
+		public static final Integer S_5 = 5;
 	}
 	
 	/**

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

@@ -55,6 +55,7 @@
 			<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="unit" 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}"/>

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

@@ -68,6 +68,7 @@
 			<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="unit" 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}"/>

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

@@ -67,6 +67,7 @@
 			<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="unit" 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}"/>

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

@@ -14,7 +14,7 @@
 			<EF:EFInput cname="计划单号" blockId="inqu_status" ename="planNo" row="0" colWidth="3"/>
 			<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部"
 			             defultValue="">
-				<EF:EFCodeOption codeName="hggp.hgcg.contractStatus" condition="ITEM_CODE IN ('1', '3')"/>
+				<EF:EFCodeOption codeName="hggp.hgcg.contractStatus" condition="ITEM_CODE IN ('2', '4')"/>
 			</EF:EFSelect>
 		</div>
 		<div class="row">
@@ -69,7 +69,7 @@
 			                  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="purUserName" cname="采购员" enable="false" width="100" 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}"/>