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

src/main/java/com/baosight/hpjx/hp/constant/HPSqlConstant.java

@@ -68,6 +68,8 @@ public class HPSqlConstant {
 		public static final String QUERY_SUM = "HPKC005.querySum";
 		// 锁
 		public static final String LOCK = "HPKC005.lock";
+		// 统计
+		public static final String STAT_DATE = "HPKC005.statDate";
 	}
 	
 	/**
@@ -114,6 +116,8 @@ public class HPSqlConstant {
 		public static final String DELETE_BY_TIME = "HPKC009.deleteByTime";
 		// 查询
 		public static final String QUERY = "HPKC009.query";
+		// 查询统计
+		public static final String QUERY_SUM = "HPKC009.querySum";
 	}
 	
 	/**
@@ -129,6 +133,18 @@ public class HPSqlConstant {
 	}
 	
 	/**
+	 * HPKC010A SQL 定义
+	 *
+	 * @author:songx
+	 * @date:2024/1/20,16:45
+	 */
+	public class HPKC010A {
+		
+		// 备份数量
+		public static final String BACKUP = "HPKC010A.backup";
+	}
+	
+	/**
 	 * HPPZ010 SQL 定义
 	 *
 	 * @author:songx

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC009.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-01-25 8:45:22 create
+ * @history 2024-01-25 17:48:25 create
  */
 public class HPKC009 extends DaoEPBase {
 	
@@ -25,7 +25,6 @@ public class HPKC009 extends DaoEPBase {
 	public static final String FIELD_ID = "id";
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
-	public static final String FIELD_KC_TYPE = "kcType";    		/* 库存类型：CG:采购，SC:生产，QT:其他*/
 	public static final String FIELD_DATE_TYPE = "dateType";    		/* 日期类型：DAY:天，MONTH:月*/
 	public static final String FIELD_DATE_PROC = "dateProc";    		/* 日期*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
@@ -36,10 +35,24 @@ public class HPKC009 extends DaoEPBase {
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 规格ID*/
 	public static final String FIELD_INIT_AMOUNT = "initAmount";    		/* 期初数量*/
 	public static final String FIELD_INIT_WEIGHT = "initWeight";    		/* 期初重量*/
+	public static final String FIELD_CG_ENTER_AMOUNT = "cgEnterAmount";    		/* 采购入库数量*/
+	public static final String FIELD_CG_ENTER_WEIGHT = "cgEnterWeight";    		/* 采购入库重量*/
+	public static final String FIELD_SC_ENTER_AMOUNT = "scEnterAmount";    		/* 生产入库数量*/
+	public static final String FIELD_SC_ENTER_WEIGHT = "scEnterWeight";    		/* 生产入库重量*/
+	public static final String FIELD_QT_ENTER_AMOUNT = "qtEnterAmount";    		/* 其它入库数量*/
+	public static final String FIELD_QT_ENTER_WEIGHT = "qtEnterWeight";    		/* 其它入库重量*/
 	public static final String FIELD_ENTER_AMOUNT = "enterAmount";    		/* 入库数量*/
 	public static final String FIELD_ENTER_WEIGHT = "enterWeight";    		/* 入库重量*/
+	public static final String FIELD_SC_OUTER_AMOUNT = "scOuterAmount";    		/* 生产领料数量*/
+	public static final String FIELD_SC_OUTER_WEIGHT = "scOuterWeight";    		/* 生产领料重量*/
+	public static final String FIELD_XS_OUTER_AMOUNT = "xsOuterAmount";    		/* 销售出库数量*/
+	public static final String FIELD_XS_OUTER_WEIGHT = "xsOuterWeight";    		/* 销售出库重量*/
+	public static final String FIELD_QT_OUTER_AMOUNT = "qtOuterAmount";    		/* 其它出库数量*/
+	public static final String FIELD_QT_OUTER_WEIGHT = "qtOuterWeight";    		/* 其它出库重量*/
 	public static final String FIELD_OUTER_AMOUNT = "outerAmount";    		/* 出库数量*/
 	public static final String FIELD_OUTER_WEIGHT = "outerWeight";    		/* 出库重量*/
+	public static final String FIELD_PD_DIFF_AMOUNT = "pdDiffAmount";    		/* 盘点差异数量*/
+	public static final String FIELD_PD_DIFF_WEIGHT = "pdDiffWeight";    		/* 盘点差异重量*/
 	public static final String FIELD_END_AMOUNT = "endAmount";    		/* 期末数量*/
 	public static final String FIELD_END_WEIGHT = "endWeight";    		/* 期末重量*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
@@ -52,7 +65,6 @@ public class HPKC009 extends DaoEPBase {
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
-	public static final String COL_KC_TYPE = "KC_TYPE";    		/* 库存类型：CG:采购，SC:生产，QT:其他*/
 	public static final String COL_DATE_TYPE = "DATE_TYPE";    		/* 日期类型：DAY:天，MONTH:月*/
 	public static final String COL_DATE_PROC = "DATE_PROC";    		/* 日期*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
@@ -63,10 +75,24 @@ public class HPKC009 extends DaoEPBase {
 	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 规格ID*/
 	public static final String COL_INIT_AMOUNT = "INIT_AMOUNT";    		/* 期初数量*/
 	public static final String COL_INIT_WEIGHT = "INIT_WEIGHT";    		/* 期初重量*/
+	public static final String COL_CG_ENTER_AMOUNT = "CG_ENTER_AMOUNT";    		/* 采购入库数量*/
+	public static final String COL_CG_ENTER_WEIGHT = "CG_ENTER_WEIGHT";    		/* 采购入库重量*/
+	public static final String COL_SC_ENTER_AMOUNT = "SC_ENTER_AMOUNT";    		/* 生产入库数量*/
+	public static final String COL_SC_ENTER_WEIGHT = "SC_ENTER_WEIGHT";    		/* 生产入库重量*/
+	public static final String COL_QT_ENTER_AMOUNT = "QT_ENTER_AMOUNT";    		/* 其它入库数量*/
+	public static final String COL_QT_ENTER_WEIGHT = "QT_ENTER_WEIGHT";    		/* 其它入库重量*/
 	public static final String COL_ENTER_AMOUNT = "ENTER_AMOUNT";    		/* 入库数量*/
 	public static final String COL_ENTER_WEIGHT = "ENTER_WEIGHT";    		/* 入库重量*/
+	public static final String COL_SC_OUTER_AMOUNT = "SC_OUTER_AMOUNT";    		/* 生产领料数量*/
+	public static final String COL_SC_OUTER_WEIGHT = "SC_OUTER_WEIGHT";    		/* 生产领料重量*/
+	public static final String COL_XS_OUTER_AMOUNT = "XS_OUTER_AMOUNT";    		/* 销售出库数量*/
+	public static final String COL_XS_OUTER_WEIGHT = "XS_OUTER_WEIGHT";    		/* 销售出库重量*/
+	public static final String COL_QT_OUTER_AMOUNT = "QT_OUTER_AMOUNT";    		/* 其它出库数量*/
+	public static final String COL_QT_OUTER_WEIGHT = "QT_OUTER_WEIGHT";    		/* 其它出库重量*/
 	public static final String COL_OUTER_AMOUNT = "OUTER_AMOUNT";    		/* 出库数量*/
 	public static final String COL_OUTER_WEIGHT = "OUTER_WEIGHT";    		/* 出库重量*/
+	public static final String COL_PD_DIFF_AMOUNT = "PD_DIFF_AMOUNT";    		/* 盘点差异数量*/
+	public static final String COL_PD_DIFF_WEIGHT = "PD_DIFF_WEIGHT";    		/* 盘点差异重量*/
 	public static final String COL_END_AMOUNT = "END_AMOUNT";    		/* 期末数量*/
 	public static final String COL_END_WEIGHT = "END_WEIGHT";    		/* 期末重量*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
@@ -85,7 +111,6 @@ public class HPKC009 extends DaoEPBase {
 	private Long id = null;
 	private String companyCode = " ";		/* 企业编码 预留*/
 	private String depCode = " ";		/* 部门编码*/
-	private String kcType = " ";		/* 库存类型：CG:采购，SC:生产，QT:其他*/
 	private String dateType = " ";		/* 日期类型：DAY:天，MONTH:月*/
 	private String dateProc = " ";		/* 日期*/
 	private String whCode = " ";		/* 仓库编码*/
@@ -96,10 +121,24 @@ public class HPKC009 extends DaoEPBase {
 	private Long inventRecordId = null;	/* 规格ID*/
 	private BigDecimal initAmount = new BigDecimal(0.00);		/* 期初数量*/
 	private BigDecimal initWeight = new BigDecimal(0.00);		/* 期初重量*/
+	private BigDecimal cgEnterAmount = new BigDecimal(0.00);		/* 采购入库数量*/
+	private BigDecimal cgEnterWeight = new BigDecimal(0.00);		/* 采购入库重量*/
+	private BigDecimal scEnterAmount = new BigDecimal(0.00);		/* 生产入库数量*/
+	private BigDecimal scEnterWeight = new BigDecimal(0.00);		/* 生产入库重量*/
+	private BigDecimal qtEnterAmount = new BigDecimal(0.00);		/* 其它入库数量*/
+	private BigDecimal qtEnterWeight = new BigDecimal(0.00);		/* 其它入库重量*/
 	private BigDecimal enterAmount = new BigDecimal(0.00);		/* 入库数量*/
 	private BigDecimal enterWeight = new BigDecimal(0.00);		/* 入库重量*/
+	private BigDecimal scOuterAmount = new BigDecimal(0.00);		/* 生产领料数量*/
+	private BigDecimal scOuterWeight = new BigDecimal(0.00);		/* 生产领料重量*/
+	private BigDecimal xsOuterAmount = new BigDecimal(0.00);		/* 销售出库数量*/
+	private BigDecimal xsOuterWeight = new BigDecimal(0.00);		/* 销售出库重量*/
+	private BigDecimal qtOuterAmount = new BigDecimal(0.00);		/* 其它出库数量*/
+	private BigDecimal qtOuterWeight = new BigDecimal(0.00);		/* 其它出库重量*/
 	private BigDecimal outerAmount = new BigDecimal(0.00);		/* 出库数量*/
 	private BigDecimal outerWeight = new BigDecimal(0.00);		/* 出库重量*/
+	private BigDecimal pdDiffAmount = new BigDecimal(0.00);		/* 盘点差异数量*/
+	private BigDecimal pdDiffWeight = new BigDecimal(0.00);		/* 盘点差异重量*/
 	private BigDecimal endAmount = new BigDecimal(0.00);		/* 期末数量*/
 	private BigDecimal endWeight = new BigDecimal(0.00);		/* 期末重量*/
 	private String createdBy = " ";		/* 创建人*/
@@ -128,10 +167,6 @@ public class HPKC009 extends DaoEPBase {
 		eiColumn.setDescName("部门编码");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_KC_TYPE);
-		eiColumn.setDescName("库存类型：CG:采购，SC:生产，QT:其他");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_DATE_TYPE);
 		eiColumn.setDescName("日期类型：DAY:天，MONTH:月");
 		eiMetadata.addMeta(eiColumn);
@@ -178,6 +213,48 @@ public class HPKC009 extends DaoEPBase {
 		eiColumn.setDescName("期初重量");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_CG_ENTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("采购入库数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_CG_ENTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("采购入库重量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_SC_ENTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("生产入库数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_SC_ENTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("生产入库重量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_QT_ENTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("其它入库数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_QT_ENTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("其它入库重量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_ENTER_AMOUNT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(2);
@@ -192,6 +269,48 @@ public class HPKC009 extends DaoEPBase {
 		eiColumn.setDescName("入库重量");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_SC_OUTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("生产领料数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_SC_OUTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("生产领料重量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_XS_OUTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("销售出库数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_XS_OUTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("销售出库重量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_QT_OUTER_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("其它出库数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_QT_OUTER_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("其它出库重量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_OUTER_AMOUNT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(2);
@@ -206,6 +325,20 @@ public class HPKC009 extends DaoEPBase {
 		eiColumn.setDescName("出库重量");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_PD_DIFF_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("盘点差异数量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_PD_DIFF_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("盘点差异重量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_END_AMOUNT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(2);
@@ -303,22 +436,6 @@ public class HPKC009 extends DaoEPBase {
 		this.depCode = depCode;
 	}
 	/**
-	 * get the kcType - 库存类型：CG:采购，SC:生产，QT:其他.
-	 * @return the kcType
-	 */
-	public String getKcType() {
-		return this.kcType;
-	}
-
-	/**
-	 * set the kcType - 库存类型：CG:采购，SC:生产，QT:其他.
-	 *
-	 * @param kcType - 库存类型：CG:采购，SC:生产，QT:其他
-	 */
-	public void setKcType(String kcType) {
-		this.kcType = kcType;
-	}
-	/**
 	 * get the dateType - 日期类型：DAY:天，MONTH:月.
 	 * @return the dateType
 	 */
@@ -479,6 +596,102 @@ public class HPKC009 extends DaoEPBase {
 		this.initWeight = initWeight;
 	}
 	/**
+	 * get the cgEnterAmount - 采购入库数量.
+	 * @return the cgEnterAmount
+	 */
+	public BigDecimal getCgEnterAmount() {
+		return this.cgEnterAmount;
+	}
+	
+	/**
+	 * set the cgEnterAmount - 采购入库数量.
+	 *
+	 * @param cgEnterAmount - 采购入库数量
+	 */
+	public void setCgEnterAmount(BigDecimal cgEnterAmount) {
+		this.cgEnterAmount = cgEnterAmount;
+	}
+	/**
+	 * get the cgEnterWeight - 采购入库重量.
+	 * @return the cgEnterWeight
+	 */
+	public BigDecimal getCgEnterWeight() {
+		return this.cgEnterWeight;
+	}
+	
+	/**
+	 * set the cgEnterWeight - 采购入库重量.
+	 *
+	 * @param cgEnterWeight - 采购入库重量
+	 */
+	public void setCgEnterWeight(BigDecimal cgEnterWeight) {
+		this.cgEnterWeight = cgEnterWeight;
+	}
+	/**
+	 * get the scEnterAmount - 生产入库数量.
+	 * @return the scEnterAmount
+	 */
+	public BigDecimal getScEnterAmount() {
+		return this.scEnterAmount;
+	}
+	
+	/**
+	 * set the scEnterAmount - 生产入库数量.
+	 *
+	 * @param scEnterAmount - 生产入库数量
+	 */
+	public void setScEnterAmount(BigDecimal scEnterAmount) {
+		this.scEnterAmount = scEnterAmount;
+	}
+	/**
+	 * get the scEnterWeight - 生产入库重量.
+	 * @return the scEnterWeight
+	 */
+	public BigDecimal getScEnterWeight() {
+		return this.scEnterWeight;
+	}
+	
+	/**
+	 * set the scEnterWeight - 生产入库重量.
+	 *
+	 * @param scEnterWeight - 生产入库重量
+	 */
+	public void setScEnterWeight(BigDecimal scEnterWeight) {
+		this.scEnterWeight = scEnterWeight;
+	}
+	/**
+	 * get the qtEnterAmount - 其它入库数量.
+	 * @return the qtEnterAmount
+	 */
+	public BigDecimal getQtEnterAmount() {
+		return this.qtEnterAmount;
+	}
+	
+	/**
+	 * set the qtEnterAmount - 其它入库数量.
+	 *
+	 * @param qtEnterAmount - 其它入库数量
+	 */
+	public void setQtEnterAmount(BigDecimal qtEnterAmount) {
+		this.qtEnterAmount = qtEnterAmount;
+	}
+	/**
+	 * get the qtEnterWeight - 其它入库重量.
+	 * @return the qtEnterWeight
+	 */
+	public BigDecimal getQtEnterWeight() {
+		return this.qtEnterWeight;
+	}
+	
+	/**
+	 * set the qtEnterWeight - 其它入库重量.
+	 *
+	 * @param qtEnterWeight - 其它入库重量
+	 */
+	public void setQtEnterWeight(BigDecimal qtEnterWeight) {
+		this.qtEnterWeight = qtEnterWeight;
+	}
+	/**
 	 * get the enterAmount - 入库数量.
 	 * @return the enterAmount
 	 */
@@ -511,6 +724,102 @@ public class HPKC009 extends DaoEPBase {
 		this.enterWeight = enterWeight;
 	}
 	/**
+	 * get the scOuterAmount - 生产领料数量.
+	 * @return the scOuterAmount
+	 */
+	public BigDecimal getScOuterAmount() {
+		return this.scOuterAmount;
+	}
+	
+	/**
+	 * set the scOuterAmount - 生产领料数量.
+	 *
+	 * @param scOuterAmount - 生产领料数量
+	 */
+	public void setScOuterAmount(BigDecimal scOuterAmount) {
+		this.scOuterAmount = scOuterAmount;
+	}
+	/**
+	 * get the scOuterWeight - 生产领料重量.
+	 * @return the scOuterWeight
+	 */
+	public BigDecimal getScOuterWeight() {
+		return this.scOuterWeight;
+	}
+	
+	/**
+	 * set the scOuterWeight - 生产领料重量.
+	 *
+	 * @param scOuterWeight - 生产领料重量
+	 */
+	public void setScOuterWeight(BigDecimal scOuterWeight) {
+		this.scOuterWeight = scOuterWeight;
+	}
+	/**
+	 * get the xsOuterAmount - 销售出库数量.
+	 * @return the xsOuterAmount
+	 */
+	public BigDecimal getXsOuterAmount() {
+		return this.xsOuterAmount;
+	}
+	
+	/**
+	 * set the xsOuterAmount - 销售出库数量.
+	 *
+	 * @param xsOuterAmount - 销售出库数量
+	 */
+	public void setXsOuterAmount(BigDecimal xsOuterAmount) {
+		this.xsOuterAmount = xsOuterAmount;
+	}
+	/**
+	 * get the xsOuterWeight - 销售出库重量.
+	 * @return the xsOuterWeight
+	 */
+	public BigDecimal getXsOuterWeight() {
+		return this.xsOuterWeight;
+	}
+	
+	/**
+	 * set the xsOuterWeight - 销售出库重量.
+	 *
+	 * @param xsOuterWeight - 销售出库重量
+	 */
+	public void setXsOuterWeight(BigDecimal xsOuterWeight) {
+		this.xsOuterWeight = xsOuterWeight;
+	}
+	/**
+	 * get the qtOuterAmount - 其它出库数量.
+	 * @return the qtOuterAmount
+	 */
+	public BigDecimal getQtOuterAmount() {
+		return this.qtOuterAmount;
+	}
+	
+	/**
+	 * set the qtOuterAmount - 其它出库数量.
+	 *
+	 * @param qtOuterAmount - 其它出库数量
+	 */
+	public void setQtOuterAmount(BigDecimal qtOuterAmount) {
+		this.qtOuterAmount = qtOuterAmount;
+	}
+	/**
+	 * get the qtOuterWeight - 其它出库重量.
+	 * @return the qtOuterWeight
+	 */
+	public BigDecimal getQtOuterWeight() {
+		return this.qtOuterWeight;
+	}
+	
+	/**
+	 * set the qtOuterWeight - 其它出库重量.
+	 *
+	 * @param qtOuterWeight - 其它出库重量
+	 */
+	public void setQtOuterWeight(BigDecimal qtOuterWeight) {
+		this.qtOuterWeight = qtOuterWeight;
+	}
+	/**
 	 * get the outerAmount - 出库数量.
 	 * @return the outerAmount
 	 */
@@ -543,6 +852,38 @@ public class HPKC009 extends DaoEPBase {
 		this.outerWeight = outerWeight;
 	}
 	/**
+	 * get the pdDiffAmount - 盘点差异数量.
+	 * @return the pdDiffAmount
+	 */
+	public BigDecimal getPdDiffAmount() {
+		return this.pdDiffAmount;
+	}
+	
+	/**
+	 * set the pdDiffAmount - 盘点差异数量.
+	 *
+	 * @param pdDiffAmount - 盘点差异数量
+	 */
+	public void setPdDiffAmount(BigDecimal pdDiffAmount) {
+		this.pdDiffAmount = pdDiffAmount;
+	}
+	/**
+	 * get the pdDiffWeight - 盘点差异重量.
+	 * @return the pdDiffWeight
+	 */
+	public BigDecimal getPdDiffWeight() {
+		return this.pdDiffWeight;
+	}
+	
+	/**
+	 * set the pdDiffWeight - 盘点差异重量.
+	 *
+	 * @param pdDiffWeight - 盘点差异重量
+	 */
+	public void setPdDiffWeight(BigDecimal pdDiffWeight) {
+		this.pdDiffWeight = pdDiffWeight;
+	}
+	/**
 	 * get the endAmount - 期末数量.
 	 * @return the endAmount
 	 */
@@ -681,7 +1022,6 @@ public class HPKC009 extends DaoEPBase {
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
-		setKcType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_KC_TYPE)), kcType));
 		setDateType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DATE_TYPE)), dateType));
 		setDateProc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DATE_PROC)), dateProc));
 		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
@@ -692,10 +1032,24 @@ public class HPKC009 extends DaoEPBase {
 		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setInitAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INIT_AMOUNT)), initAmount));
 		setInitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INIT_WEIGHT)), initWeight));
+		setCgEnterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CG_ENTER_AMOUNT)), cgEnterAmount));
+		setCgEnterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CG_ENTER_WEIGHT)), cgEnterWeight));
+		setScEnterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_SC_ENTER_AMOUNT)), scEnterAmount));
+		setScEnterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_SC_ENTER_WEIGHT)), scEnterWeight));
+		setQtEnterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_QT_ENTER_AMOUNT)), qtEnterAmount));
+		setQtEnterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_QT_ENTER_WEIGHT)), qtEnterWeight));
 		setEnterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ENTER_AMOUNT)), enterAmount));
 		setEnterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ENTER_WEIGHT)), enterWeight));
+		setScOuterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_SC_OUTER_AMOUNT)), scOuterAmount));
+		setScOuterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_SC_OUTER_WEIGHT)), scOuterWeight));
+		setXsOuterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_XS_OUTER_AMOUNT)), xsOuterAmount));
+		setXsOuterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_XS_OUTER_WEIGHT)), xsOuterWeight));
+		setQtOuterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_QT_OUTER_AMOUNT)), qtOuterAmount));
+		setQtOuterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_QT_OUTER_WEIGHT)), qtOuterWeight));
 		setOuterAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_OUTER_AMOUNT)), outerAmount));
 		setOuterWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_OUTER_WEIGHT)), outerWeight));
+		setPdDiffAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PD_DIFF_AMOUNT)), pdDiffAmount));
+		setPdDiffWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PD_DIFF_WEIGHT)), pdDiffWeight));
 		setEndAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_END_AMOUNT)), endAmount));
 		setEndWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_END_WEIGHT)), endWeight));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
@@ -716,7 +1070,6 @@ public class HPKC009 extends DaoEPBase {
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
-		map.put(FIELD_KC_TYPE, StringUtils.toString(kcType, eiMetadata.getMeta(FIELD_KC_TYPE)));
 		map.put(FIELD_DATE_TYPE, StringUtils.toString(dateType, eiMetadata.getMeta(FIELD_DATE_TYPE)));
 		map.put(FIELD_DATE_PROC, StringUtils.toString(dateProc, eiMetadata.getMeta(FIELD_DATE_PROC)));
 		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
@@ -727,10 +1080,24 @@ public class HPKC009 extends DaoEPBase {
 		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 		map.put(FIELD_INIT_AMOUNT, StringUtils.toString(initAmount, eiMetadata.getMeta(FIELD_INIT_AMOUNT)));
 		map.put(FIELD_INIT_WEIGHT, StringUtils.toString(initWeight, eiMetadata.getMeta(FIELD_INIT_WEIGHT)));
+		map.put(FIELD_CG_ENTER_AMOUNT, StringUtils.toString(cgEnterAmount, eiMetadata.getMeta(FIELD_CG_ENTER_AMOUNT)));
+		map.put(FIELD_CG_ENTER_WEIGHT, StringUtils.toString(cgEnterWeight, eiMetadata.getMeta(FIELD_CG_ENTER_WEIGHT)));
+		map.put(FIELD_SC_ENTER_AMOUNT, StringUtils.toString(scEnterAmount, eiMetadata.getMeta(FIELD_SC_ENTER_AMOUNT)));
+		map.put(FIELD_SC_ENTER_WEIGHT, StringUtils.toString(scEnterWeight, eiMetadata.getMeta(FIELD_SC_ENTER_WEIGHT)));
+		map.put(FIELD_QT_ENTER_AMOUNT, StringUtils.toString(qtEnterAmount, eiMetadata.getMeta(FIELD_QT_ENTER_AMOUNT)));
+		map.put(FIELD_QT_ENTER_WEIGHT, StringUtils.toString(qtEnterWeight, eiMetadata.getMeta(FIELD_QT_ENTER_WEIGHT)));
 		map.put(FIELD_ENTER_AMOUNT, StringUtils.toString(enterAmount, eiMetadata.getMeta(FIELD_ENTER_AMOUNT)));
 		map.put(FIELD_ENTER_WEIGHT, StringUtils.toString(enterWeight, eiMetadata.getMeta(FIELD_ENTER_WEIGHT)));
+		map.put(FIELD_SC_OUTER_AMOUNT, StringUtils.toString(scOuterAmount, eiMetadata.getMeta(FIELD_SC_OUTER_AMOUNT)));
+		map.put(FIELD_SC_OUTER_WEIGHT, StringUtils.toString(scOuterWeight, eiMetadata.getMeta(FIELD_SC_OUTER_WEIGHT)));
+		map.put(FIELD_XS_OUTER_AMOUNT, StringUtils.toString(xsOuterAmount, eiMetadata.getMeta(FIELD_XS_OUTER_AMOUNT)));
+		map.put(FIELD_XS_OUTER_WEIGHT, StringUtils.toString(xsOuterWeight, eiMetadata.getMeta(FIELD_XS_OUTER_WEIGHT)));
+		map.put(FIELD_QT_OUTER_AMOUNT, StringUtils.toString(qtOuterAmount, eiMetadata.getMeta(FIELD_QT_OUTER_AMOUNT)));
+		map.put(FIELD_QT_OUTER_WEIGHT, StringUtils.toString(qtOuterWeight, eiMetadata.getMeta(FIELD_QT_OUTER_WEIGHT)));
 		map.put(FIELD_OUTER_AMOUNT, StringUtils.toString(outerAmount, eiMetadata.getMeta(FIELD_OUTER_AMOUNT)));
 		map.put(FIELD_OUTER_WEIGHT, StringUtils.toString(outerWeight, eiMetadata.getMeta(FIELD_OUTER_WEIGHT)));
+		map.put(FIELD_PD_DIFF_AMOUNT, StringUtils.toString(pdDiffAmount, eiMetadata.getMeta(FIELD_PD_DIFF_AMOUNT)));
+		map.put(FIELD_PD_DIFF_WEIGHT, StringUtils.toString(pdDiffWeight, eiMetadata.getMeta(FIELD_PD_DIFF_WEIGHT)));
 		map.put(FIELD_END_AMOUNT, StringUtils.toString(endAmount, eiMetadata.getMeta(FIELD_END_AMOUNT)));
 		map.put(FIELD_END_WEIGHT, StringUtils.toString(endWeight, eiMetadata.getMeta(FIELD_END_WEIGHT)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC010.java

 package com.baosight.hpjx.hp.kc.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>
- * Title:THPK010.java <br>
+ * Title:THpkc010.java <br>
  * Description: <br>
  *
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-01-11 15:32:44 create
+ * @history 2024-01-25 17:57:24 create
  */
 public class HPKC010 extends DaoEPBase {
 	
 	private static final long serialVersionUID = 1L;
 	
 	public static final String FIELD_ID = "id";
-	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
+	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	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_INVENT_TYPE = "inventType";    		/* 物料类型*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
+	public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
-	public static final String FIELD_AMOUNT = "amount";    		/* 账面数量*/
-	public static final String FIELD_WEIGHT = "weight";    		/* 账面重量*/
+	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
+	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
 	public static final String FIELD_CREATED_NAME = "createdName";    		/* 创建人名称*/
 	public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
@@ -42,22 +42,23 @@ public class HPKC010 extends DaoEPBase {
 	public static final String FIELD_VERSION = "version";    		/* 版本号*/
 	
 	public static final String COL_ID = "ID";
-	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
+	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 	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_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
-	public static final String COL_AMOUNT = "amount";    		/* 数量*/
-	public static final String COL_WEIGHT = "weight";    		/* 重量*/
+	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_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
+	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
+	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
 	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_VERSION = "VERSION";    		/* 部门编码*/
+	public static final String COL_VERSION = "VERSION";    		/* 版本号*/
 	
 	public static final String QUERY = "HPKC010.query";
 	public static final String COUNT = "HPKC010.count";
@@ -65,23 +66,24 @@ public class HPKC010 extends DaoEPBase {
 	public static final String UPDATE = "HPKC010.update";
 	public static final String DELETE = "HPKC010.delete";
 	
-	private Long id = new Long(0);
-	private String companyCode = " ";		/* 企业编码 预留*/
+	private Long id = null;
+	private String companyCode = " ";		/* 企业编码*/
+	private String depCode = " ";		/* 部门编码*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private String inventType = " ";		/* 存货类型*/
-	private String inventCode = " ";		/* 存货编码*/
-	private String inventName = " ";		/* 存货名称*/
-	private Long inventRecordId = new Long(0);		/* 存货档案ID*/
-	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
-	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
+	private String inventType = " ";		/* 物料类型*/
+	private String inventCode = " ";		/* 物料编码*/
+	private String inventName = " ";		/* 物料名称*/
+	private Long inventRecordId = null;		/* 存货档案ID*/
+	private BigDecimal amount = new BigDecimal("0");		/* 数量*/
+	private BigDecimal weight = new BigDecimal("0");		/* 重量*/
 	private String createdBy = " ";		/* 创建人*/
 	private String createdName = " ";		/* 创建人名称*/
 	private String createdTime = " ";		/* 创建时间*/
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
-	private Long version = new Long(0);		/* 版本号*/
+	private Integer version = null;		/* 版本号*/
 	
 	/**
 	 * initialize the metadata.
@@ -95,7 +97,11 @@ public class HPKC010 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
-		eiColumn.setDescName("企业编码 预留");
+		eiColumn.setDescName("企业编码");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_WH_CODE);
@@ -107,15 +113,15 @@ public class HPKC010 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
-		eiColumn.setDescName("存货类型");
+		eiColumn.setDescName("物料类型");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
-		eiColumn.setDescName("存货编码");
+		eiColumn.setDescName("物料编码");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
-		eiColumn.setDescName("存货名称");
+		eiColumn.setDescName("物料名称");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
@@ -124,15 +130,15 @@ public class HPKC010 extends DaoEPBase {
 		
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(2);
-		eiColumn.setFieldLength(10);
+		eiColumn.setScaleLength(0);
+		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("数量");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_WEIGHT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(2);
-		eiColumn.setFieldLength(10);
+		eiColumn.setScaleLength(0);
+		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("重量");
 		eiMetadata.addMeta(eiColumn);
 		
@@ -191,7 +197,7 @@ public class HPKC010 extends DaoEPBase {
 		this.id = id;
 	}
 	/**
-	 * get the companyCode - 企业编码 预留.
+	 * get the companyCode - 企业编码.
 	 * @return the companyCode
 	 */
 	public String getCompanyCode() {
@@ -199,15 +205,30 @@ public class HPKC010 extends DaoEPBase {
 	}
 	
 	/**
-	 * set the companyCode - 企业编码 预留.
+	 * set the companyCode - 企业编码.
 	 *
-	 * @param companyCode - 企业编码 预留
+	 * @param companyCode - 企业编码
 	 */
 	public void setCompanyCode(String companyCode) {
 		this.companyCode = companyCode;
 	}
+	/**
+	 * 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 whCode - 仓库编码.
 	 * @return the whCode
 	 */
@@ -240,77 +261,108 @@ public class HPKC010 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the matType - 存货类型.
-	 * @return the matType
+	 * get the inventType - 物料类型.
+	 * @return the inventType
 	 */
 	public String getInventType() {
 		return this.inventType;
 	}
 	
 	/**
-	 * set the matType - 存货类型.
+	 * set the inventType - 物料类型.
 	 *
-	 * @param inventType - 存货类型
+	 * @param inventType - 物料类型
 	 */
 	public void setInventType(String inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the matCode - 存货编码.
-	 * @return the matCode
+	 * get the inventCode - 物料编码.
+	 * @return the inventCode
 	 */
 	public String getInventCode() {
 		return this.inventCode;
 	}
 	
 	/**
-	 * set the matCode - 存货编码.
+	 * set the inventCode - 物料编码.
 	 *
-	 * @param inventCode - 存货编码
+	 * @param inventCode - 物料编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the matName - 存货名称.
-	 * @return the matName
+	 * get the inventName - 物料名称.
+	 * @return the inventName
 	 */
 	public String getInventName() {
 		return this.inventName;
 	}
 	
 	/**
-	 * set the matName - 存货名称.
+	 * set the inventName - 物料名称.
 	 *
-	 * @param inventName - 存货名称
+	 * @param inventName - 物料名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
-
+	/**
+	 * get the inventRecordId - 存货档案ID.
+	 * @return the inventRecordId
+	 */
 	public Long getInventRecordId() {
-		return inventRecordId;
+		return this.inventRecordId;
 	}
 	
+	/**
+	 * set the inventRecordId - 存货档案ID.
+	 *
+	 * @param inventRecordId - 存货档案ID
+	 */
 	public void setInventRecordId(Long inventRecordId) {
 		this.inventRecordId = inventRecordId;
 	}
-
+	/**
+	 * get the amount - 数量.
+	 * @return the amount
+	 */
 	public BigDecimal getAmount() {
-		return amount;
+		return this.amount;
 	}
 	
+	/**
+	 * set the amount - 数量.
+	 *
+	 * @param amount - 数量
+	 */
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
-
+	/**
+	 * get the weight - 重量.
+	 * @return the weight
+	 */
 	public BigDecimal getWeight() {
-		return weight;
+		return this.weight;
 	}
 	
+	/**
+	 * set the weight - 重量.
+	 *
+	 * @param weight - 重量
+	 */
 	public void setWeight(BigDecimal weight) {
 		this.weight = weight;
 	}
+	/**
+	 * get the createdBy - 创建人.
+	 * @return the createdBy
+	 */
+	public String getCreatedBy() {
+		return this.createdBy;
+	}
 	
 	/**
 	 * set the createdBy - 创建人.
@@ -321,7 +373,7 @@ public class HPKC010 extends DaoEPBase {
 		this.createdBy = createdBy;
 	}
 	/**
-	 * get the createdName - 创建名称.
+	 * get the createdName - 创建人名称.
 	 * @return the createdName
 	 */
 	public String getCreatedName() {
@@ -329,9 +381,9 @@ public class HPKC010 extends DaoEPBase {
 	}
 	
 	/**
-	 * set the createdName - 创建名称.
+	 * set the createdName - 创建人名称.
 	 *
-	 * @param createdName - 创建名称
+	 * @param createdName - 创建人名称
 	 */
 	public void setCreatedName(String createdName) {
 		this.createdName = createdName;
@@ -400,15 +452,22 @@ public class HPKC010 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
-
-	public Long getVersion() {
-		return version;
+	/**
+	 * get the version - 版本号.
+	 * @return the version
+	 */
+	public Integer getVersion() {
+		return this.version;
 	}
 	
-	public void setVersion(Long version) {
+	/**
+	 * set the version - 版本号.
+	 *
+	 * @param version - 版本号
+	 */
+	public void setVersion(Integer version) {
 		this.version = version;
 	}
-
 	/**
 	 * get the value from Map.
 	 *
@@ -419,12 +478,13 @@ public class HPKC010 extends DaoEPBase {
 		
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		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));
-		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), id));
+		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
@@ -433,7 +493,7 @@ public class HPKC010 extends DaoEPBase {
 		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));
-		setVersion(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_VERSION)), version));
+		setVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_VERSION)), version));
 	}
 	
 	/**
@@ -445,6 +505,7 @@ public class HPKC010 extends DaoEPBase {
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		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)));

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC010A.java

+package com.baosight.hpjx.hp.kc.domain;
+
+import com.baosight.iplat4j.core.util.NumberUtils;
+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>
+ * Title:THpkc010a.java <br>
+ * Description: <br>
+ *
+ * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
+ *
+ * @version 1.0
+ * @history 2024-01-25 18:41:22 create
+ */
+public class HPKC010A extends DaoEPBase {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String FIELD_ID = "id";
+	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_DATE_PROC = "dateProc";    		/* 日期*/
+	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_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
+	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
+	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
+	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_VERSION = "version";    		/* 版本号*/
+
+	public static final String COL_ID = "ID";
+	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+	public static final String COL_DATE_PROC = "DATE_PROC";    		/* 日期*/
+	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_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
+	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
+	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
+	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_VERSION = "VERSION";    		/* 版本号*/
+
+	public static final String QUERY = "HPKC010A.query";
+	public static final String COUNT = "HPKC010A.count";
+	public static final String INSERT = "HPKC010A.insert";
+	public static final String UPDATE = "HPKC010A.update";
+	public static final String DELETE = "HPKC010A.delete";
+
+	private Long id = null;
+	private String companyCode = " ";		/* 企业编码*/
+	private String depCode = " ";		/* 部门编码*/
+	private String dateProc = " ";		/* 日期*/
+	private String whCode = " ";		/* 仓库编码*/
+	private String whName = " ";		/* 仓库名称*/
+	private String inventType = " ";		/* 物料类型*/
+	private String inventCode = " ";		/* 物料编码*/
+	private String inventName = " ";		/* 物料名称*/
+	private Long inventRecordId = null;	/* 存货档案ID*/
+	private BigDecimal amount = new BigDecimal("0");		/* 数量*/
+	private BigDecimal weight = new BigDecimal("0");		/* 重量*/
+	private String createdBy = " ";		/* 创建人*/
+	private String createdName = " ";		/* 创建人名称*/
+	private String createdTime = " ";		/* 创建时间*/
+	private String updatedBy = " ";		/* 更新人*/
+	private String updatedName = " ";		/* 更新人名称*/
+	private String updatedTime = " ";		/* 更新时间*/
+	private Integer version = null;		/* 版本号*/
+
+	/**
+	 * 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_COMPANY_CODE);
+		eiColumn.setDescName("企业编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DATE_PROC);
+		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_INVENT_RECORD_ID);
+		eiColumn.setDescName("存货档案ID");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(0);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("数量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(0);
+		eiColumn.setFieldLength(12);
+		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_VERSION);
+		eiColumn.setDescName("版本号");
+		eiMetadata.addMeta(eiColumn);
+
+
+	}
+
+	/**
+	 * the constructor.
+	 */
+	public HPKC010A() {
+		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 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 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 dateProc - 日期.
+	 * @return the dateProc
+	 */
+	public String getDateProc() {
+		return this.dateProc;
+	}
+
+	/**
+	 * set the dateProc - 日期.
+	 *
+	 * @param dateProc - 日期
+	 */
+	public void setDateProc(String dateProc) {
+		this.dateProc = dateProc;
+	}
+	/**
+	 * 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 inventRecordId - 存货档案ID.
+	 * @return the inventRecordId
+	 */
+	public Long getInventRecordId() {
+		return this.inventRecordId;
+	}
+
+	/**
+	 * set the inventRecordId - 存货档案ID.
+	 *
+	 * @param inventRecordId - 存货档案ID
+	 */
+	public void setInventRecordId(Long inventRecordId) {
+		this.inventRecordId = inventRecordId;
+	}
+	/**
+	 * get the amount - 数量.
+	 * @return the amount
+	 */
+	public BigDecimal getAmount() {
+		return this.amount;
+	}
+
+	/**
+	 * set the amount - 数量.
+	 *
+	 * @param amount - 数量
+	 */
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+	/**
+	 * get the weight - 重量.
+	 * @return the weight
+	 */
+	public BigDecimal getWeight() {
+		return this.weight;
+	}
+
+	/**
+	 * set the weight - 重量.
+	 *
+	 * @param weight - 重量
+	 */
+	public void setWeight(BigDecimal weight) {
+		this.weight = weight;
+	}
+	/**
+	 * 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 version - 版本号.
+	 * @return the version
+	 */
+	public Integer getVersion() {
+		return this.version;
+	}
+
+	/**
+	 * set the version - 版本号.
+	 *
+	 * @param version - 版本号
+	 */
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
+	/**
+	 * 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));
+		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setDateProc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DATE_PROC)), dateProc));
+		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));
+		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
+		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
+		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
+		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));
+		setVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_VERSION)), version));
+	}
+
+	/**
+	 * 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_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		map.put(FIELD_DATE_PROC, StringUtils.toString(dateProc, eiMetadata.getMeta(FIELD_DATE_PROC)));
+		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_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
+		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
+		map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
+		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_VERSION, StringUtils.toString(version, eiMetadata.getMeta(FIELD_VERSION)));
+
+		return map;
+	}
+}

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

@@ -9,9 +9,12 @@ import com.baosight.hpjx.hp.kc.domain.HPKC001;
 import com.baosight.hpjx.hp.kc.domain.HPKC002;
 import com.baosight.hpjx.hp.kc.domain.HPKC003;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
+import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.domain.HPKC009;
+import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.kc.domain.HPKC010A;
 import com.baosight.hpjx.hp.pz.domain.HPPZ007;
 import com.baosight.hpjx.hp.pz.domain.HPPZ009;
 import com.baosight.hpjx.hp.pz.domain.HPPZ004;
@@ -82,7 +85,7 @@ public class ServiceHPKC009 extends ServiceBase {
 					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
 			queryRow.put("dateType", CommonConstant.DateType.MONTH);
 			inInfo = super.query(inInfo, HPKC009.QUERY, new HPKC009());
-			List sum = dao.query("HPKC009.querySum", queryRow);
+			List sum = dao.query(HPSqlConstant.HPKC009.QUERY_SUM, queryRow);
 			inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -98,7 +101,6 @@ public class ServiceHPKC009 extends ServiceBase {
 	 */
 	public EiInfo statDay(EiInfo inInfo) {
 		try {
-			List<HPKC009> results = new ArrayList<>();
 			// 取昨天的日期
 			Map queryMap = new HashMap();
 			LocalDate nowDate = LocalDate.now();
@@ -111,12 +113,8 @@ public class ServiceHPKC009 extends ServiceBase {
 			// 0.清除数据
 			queryMap.put("dateProc", queryMap.get("yesterDate"));
 			dao.delete(HPSqlConstant.HPKC009.DELETE_BY_TIME, queryMap);
-			// 1、统计采购库存
-			results.addAll(this.statCg(queryMap));
-			// 2、统计生产库存
-			results.addAll(this.statSc(queryMap));
-			// 3、统计其他库存
-			results.addAll(this.statQt(queryMap));
+			// 1、统计收发存
+			List<HPKC009> results = this.statData(queryMap);
 			// 4、设置基础信息
 			this.setBaseInfo(results);
 			// 5、写入数据库
@@ -137,7 +135,6 @@ public class ServiceHPKC009 extends ServiceBase {
 	 */
 	public EiInfo statMonth(EiInfo inInfo) {
 		try {
-			List<HPKC009> results = new ArrayList<>();
 			// 上个月的日期
 			Map queryMap = new HashMap();
 			LocalDate nowDate = LocalDate.now();
@@ -152,12 +149,8 @@ public class ServiceHPKC009 extends ServiceBase {
 			// 0.清除数据
 			queryMap.put("dateProc", queryMap.get("yesterDate"));
 			dao.delete(HPSqlConstant.HPKC009.DELETE_BY_TIME, queryMap);
-			// 1、统计采购库存
-			results.addAll(this.statCg(queryMap));
-			// 2、统计生产库存
-			results.addAll(this.statSc(queryMap));
-			// 3、统计其他库存
-			results.addAll(this.statQt(queryMap));
+			// 1、统计收发存
+			List<HPKC009> results = this.statData(queryMap);
 			// 4、设置基础信息
 			this.setBaseInfo(results);
 			// 5、写入数据库
@@ -171,6 +164,130 @@ public class ServiceHPKC009 extends ServiceBase {
 	}
 	
 	/**
+	 * 统计库存收发存
+	 *
+	 * @return
+	 */
+	private List<HPKC009> statData(Map queryMap) {
+		List<HPKC009> newKc009s = new ArrayList<>();
+		// 1.1、期末库存
+		queryMap.put("dateProc", queryMap.get("yesterTo"));
+		List<HPKC010> endKcs = dao.query(HPKC010A.QUERY, queryMap);
+		// 1.2、采购入库
+		queryMap.put("createdTimeFrom", queryMap.get("yesterFrom") + "000000");
+		queryMap.put("createdTimeTo", queryMap.get("yesterTo") + "235959");
+		List<HPKC001> cgRks = dao.query(HPSqlConstant.HPKC001.STAT_DATE, queryMap);
+		Map<String, HPKC001> cgRkMap = cgRks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 1.3、生产入库
+		List<HPKC003> scRks = dao.query(HPSqlConstant.HPKC003.STAT_DATE, queryMap);
+		Map<String, HPKC003> scRkMap = scRks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode(), item -> item));
+		// 1.4、其他入库
+		List<HPKC006> qtRks = dao.query(HPSqlConstant.HPKC006.STAT_DATE, queryMap);
+		Map<String, HPKC006> qtRkMap = qtRks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 1.5、生产领料
+		List<HPKC002> scCks = dao.query(HPSqlConstant.HPKC002.STAT_DATE, queryMap);
+		Map<String, HPKC002> scCkMap = scCks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 1.6、销售出库
+		List<HPKC004> xsCks = dao.query(HPSqlConstant.HPKC004.STAT_DATE, queryMap);
+		Map<String, HPKC004> xsCkMap = xsCks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode(), item -> item));
+		// 1.7、其它出库
+		List<HPKC007> qtCks = dao.query(HPSqlConstant.HPKC007.STAT_DATE, queryMap);
+		Map<String, HPKC007> qtCkMap = qtCks.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 1.8、盘点差异数量
+		List<HPKC005> pdDiffs = dao.query(HPSqlConstant.HPKC005.STAT_DATE, queryMap);
+		Map<String, HPKC005> pdDiffMap = pdDiffs.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 1.9、期初库存
+		queryMap.put("dateProc", queryMap.get("beforeDate"));
+		List<HPKC009> initKcs = dao.query(HPKC009.QUERY, new HashMap<>());
+		Map<String, HPKC009> initKcMap = initKcs.stream().collect(Collectors.toMap(item ->
+				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+						+ item.getInventType() + "#" + item.getInventCode() + "#"
+						+ item.getInventRecordId(), item -> item));
+		// 根据期末库存生成收发存对象
+		for (HPKC010 endKc : endKcs) {
+			String key = endKc.getCompanyCode() + "#" + endKc.getDepCode() + "#"
+					+ endKc.getWhCode() + "#" + endKc.getInventType() + "#"
+					+ endKc.getInventCode() + "#" + endKc.getInventRecordId();
+			HPKC009 kc009 = BeanUtils.copy(endKc, HPKC009.class);
+			kc009.setDateType(queryMap.get("dateType").toString());
+			kc009.setDateProc(queryMap.get("yesterDate").toString());
+			// 1.1期末
+			kc009.setEndAmount(endKc.getAmount());
+			kc009.setEndWeight(endKc.getWeight());
+			// 1.2、采购入库
+			HPKC001 cgRk = cgRkMap.get(key);
+			kc009.setCgEnterAmount(cgRk == null ? BigDecimal.ZERO : cgRk.getAmount());
+			kc009.setCgEnterWeight(cgRk == null ? BigDecimal.ZERO : cgRk.getWeight());
+			// 1.3、生产入库
+			HPKC003 scRk = scRkMap.get(key);
+			kc009.setScEnterAmount(scRk == null ? BigDecimal.ZERO : scRk.getAmount());
+			kc009.setScEnterWeight(scRk == null ? BigDecimal.ZERO : scRk.getWeight());
+			// 1.3、其他入库
+			HPKC006 qtRk = qtRkMap.get(key);
+			kc009.setQtEnterAmount(qtRk == null ? BigDecimal.ZERO : qtRk.getAmount());
+			kc009.setQtEnterWeight(qtRk == null ? BigDecimal.ZERO : qtRk.getWeight());
+			// 1.4、入库
+			kc009.setEnterAmount(kc009.getCgEnterAmount().add(kc009.getScEnterAmount())
+					.add(kc009.getQtEnterAmount()));
+			kc009.setEnterWeight(kc009.getCgEnterWeight().add(kc009.getScEnterWeight())
+					.add(kc009.getQtEnterWeight()));
+			// 1.5、生产领料
+			HPKC002 scCk = scCkMap.get(key);
+			kc009.setScOuterAmount(scCk == null ? BigDecimal.ZERO : scCk.getAmount());
+			kc009.setScOuterWeight(scCk == null ? BigDecimal.ZERO : scCk.getWeight());
+			// 1.6、销售出库
+			HPKC004 xsCk = xsCkMap.get(key);
+			kc009.setXsOuterAmount(xsCk == null ? BigDecimal.ZERO : xsCk.getAmount());
+			kc009.setXsOuterWeight(xsCk == null ? BigDecimal.ZERO : xsCk.getWeight());
+			// 1.7、其他出库
+			HPKC007 qtCk = qtCkMap.get(key);
+			kc009.setQtOuterAmount(qtCk == null ? BigDecimal.ZERO : qtCk.getAmount());
+			kc009.setQtOuterWeight(qtCk == null ? BigDecimal.ZERO : qtCk.getWeight());
+			// 1.8、出库
+			kc009.setOuterAmount(kc009.getScOuterAmount().add(kc009.getXsOuterAmount())
+					.add(kc009.getQtOuterAmount()));
+			kc009.setOuterWeight(kc009.getScOuterWeight().add(kc009.getXsOuterWeight())
+					.add(kc009.getQtOuterWeight()));
+			// 1.8、盘点差异数量
+			HPKC005 pdDiff = pdDiffMap.get(key);
+			kc009.setPdDiffAmount(pdDiff == null ? BigDecimal.ZERO : pdDiff.getDiffAmount());
+			kc009.setPdDiffWeight(pdDiff == null ? BigDecimal.ZERO : pdDiff.getDiffWeight());
+			// 1.9、期初
+			HPKC009 initKc = initKcMap.get(key);
+			if (initKc != null) {
+				kc009.setInitAmount(initKc.getEndAmount());
+				kc009.setInitWeight(initKc.getEndWeight());
+			} else {
+				kc009.setInitAmount(kc009.getEndAmount().subtract(kc009.getPdDiffAmount())
+						.add(kc009.getOuterAmount()).subtract(kc009.getEnterAmount()));
+				kc009.setInitWeight(kc009.getEndWeight().subtract(kc009.getPdDiffWeight())
+						.add(kc009.getOuterWeight()).subtract(kc009.getEnterWeight()));
+			}
+			newKc009s.add(kc009);
+		}
+		return newKc009s;
+	}
+	
+	/**
 	 * 按天统计采购库存
 	 *
 	 * @return
@@ -209,7 +326,6 @@ public class ServiceHPKC009 extends ServiceBase {
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
 			kc009.setInventType(aItem.getInventType());
 			kc009.setInventCode(aItem.getInventCode());
-			kc009.setKcType(HPConstant.KcType.CG);
 			kc009.setDateType(queryMap.get("dateType").toString());
 			kc009.setDateProc(queryMap.get("yesterDate").toString());
 			// 期末
@@ -277,7 +393,6 @@ public class ServiceHPKC009 extends ServiceBase {
 			kc009.setWhCode(aItem.getWhCode());
 			kc009.setInventType(aItem.getInventType() + "");
 			kc009.setInventCode(aItem.getInventCode());
-			kc009.setKcType(HPConstant.KcType.SC);
 			kc009.setDateType(queryMap.get("dateType").toString());
 			kc009.setDateProc(queryMap.get("yesterDate").toString());
 			// 期末
@@ -347,7 +462,6 @@ public class ServiceHPKC009 extends ServiceBase {
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
 			kc009.setInventType(aItem.getInventType());
 			kc009.setInventCode(aItem.getInventCode());
-			kc009.setKcType(HPConstant.KcType.QT);
 			kc009.setDateType(queryMap.get("dateType").toString());
 			kc009.setDateProc(queryMap.get("yesterDate").toString());
 			// 期末

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

+package com.baosight.hpjx.hp.kc.service;
+
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.constant.HPSqlConstant;
+import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.DateUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author:songx
+ * @date:2024/1/25,18:49
+ */
+public class ServiceHPKC010A extends ServiceBase {
+	
+	/**
+	 * 备份数据
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo backup(EiInfo inInfo) {
+		try {
+			Map queryMap = new HashMap();
+			queryMap.put("dateProc", LocalDate.now().minusDays(1).format(DateUtils.SHORT_DATE));
+			dao.insert(HPSqlConstant.HPKC010A.BACKUP, queryMap);
+			inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+			inInfo.setMsg("备份数据成功");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "新增失败");
+		}
+		return inInfo;
+	}
+}

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

@@ -216,4 +216,23 @@
         </isNotEmpty>
     </update>
 
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005">
+        SELECT
+            COMPANY_CODE AS "companyCode",
+            DEP_CODE AS "depCode",
+            WH_CODE AS "whCode",
+            INVENT_TYPE AS "inventType",
+            INVENT_CODE AS "inventCode",
+            INVENT_RECORD_ID AS "inventRecordId",
+            COALESCE(SUM(DIFF_AMOUNT), 0) AS "diffAmount",
+            COALESCE(SUM(DIFF_WEIGHT), 0) AS "diffWeight"
+        FROM ${hpjxSchema}.T_HPKC005
+        WHERE 1=1
+        <isNotEmpty prepend=" AND " property="createdTimeFrom">
+            CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
+        </isNotEmpty>
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+    </select>
+
 </sqlMap>

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

@@ -6,7 +6,6 @@
         ID as "id",
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         DEP_CODE as "depCode",  <!-- 部门编码 -->
-        KC_TYPE as "kcType",  <!-- 库存类型：CG:采购，SC:生产，QT:其他 -->
         DATE_TYPE as "dateType",  <!-- 日期类型：DAY:天，MONTH:月 -->
         DATE_PROC as "dateProc",  <!-- 日期 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
@@ -17,10 +16,24 @@
         INVENT_RECORD_ID as "inventRecordId",  <!-- 规格ID -->
         INIT_AMOUNT as "initAmount",  <!-- 期初数量 -->
         INIT_WEIGHT as "initWeight",  <!-- 期初重量 -->
+        CG_ENTER_AMOUNT as "cgEnterAmount",  <!-- 采购入库数量 -->
+        CG_ENTER_WEIGHT as "cgEnterWeight",  <!-- 采购入库重量 -->
+        SC_ENTER_AMOUNT as "scEnterAmount",  <!-- 生产入库数量 -->
+        SC_ENTER_WEIGHT as "scEnterWeight",  <!-- 生产入库重量 -->
+        QT_ENTER_AMOUNT as "qtEnterAmount",  <!-- 其它入库数量 -->
+        QT_ENTER_WEIGHT as "qtEnterWeight",  <!-- 其它入库重量 -->
         ENTER_AMOUNT as "enterAmount",  <!-- 入库数量 -->
         ENTER_WEIGHT as "enterWeight",  <!-- 入库重量 -->
+        SC_OUTER_AMOUNT as "scOuterAmount",  <!-- 生产领料数量 -->
+        SC_OUTER_WEIGHT as "scOuterWeight",  <!-- 生产领料重量 -->
+        XS_OUTER_AMOUNT as "xsOuterAmount",  <!-- 销售出库数量 -->
+        XS_OUTER_WEIGHT as "xsOuterWeight",  <!-- 销售出库重量 -->
+        QT_OUTER_AMOUNT as "qtOuterAmount",  <!-- 其它出库数量 -->
+        QT_OUTER_WEIGHT as "qtOuterWeight",  <!-- 其它出库重量 -->
         OUTER_AMOUNT as "outerAmount",  <!-- 出库数量 -->
         OUTER_WEIGHT as "outerWeight",  <!-- 出库重量 -->
+        PD_DIFF_AMOUNT as "pdDiffAmount",   <!-- 盘点差异数量 -->
+        PD_DIFF_WEIGHT as "pdDiffWeight",   <!-- 盘点差异重量 -->
         END_AMOUNT as "endAmount",  <!-- 期末数量 -->
         END_WEIGHT as "endWeight",  <!-- 期末重量 -->
         CREATED_BY as "createdBy",  <!-- 创建人 -->
@@ -41,9 +54,6 @@
         <isNotEmpty prepend=" AND " property="depCode">
             DEP_CODE = #depCode#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="kcType">
-            KC_TYPE = #kcType#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="dateType">
             DATE_TYPE = #dateType#
         </isNotEmpty>
@@ -76,7 +86,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                ID asc
+                ID DESC
             </isEmpty>
         </dynamic>
     </sql>
@@ -101,10 +111,24 @@
         SELECT
             COALESCE(SUM(INIT_AMOUNT), 0) AS "initAmount",  <!-- 期初数量 -->
             COALESCE(SUM(INIT_WEIGHT), 0) AS "initWeight",  <!-- 期初重量 -->
+            COALESCE(SUM(CG_ENTER_AMOUNT), 0) AS "cgEnterAmount",  <!-- 采购入库数量 -->
+            COALESCE(SUM(CG_ENTER_WEIGHT), 0) AS "cgEnterWeight",  <!-- 采购入库重量 -->
+            COALESCE(SUM(SC_ENTER_AMOUNT), 0) AS "scEnterAmount",  <!-- 生产入库数量 -->
+            COALESCE(SUM(SC_ENTER_WEIGHT), 0) AS "scEnterWeight",  <!-- 生产入库重量 -->
+            COALESCE(SUM(QT_ENTER_AMOUNT), 0) AS "qtEnterAmount",  <!-- 其它入库数量 -->
+            COALESCE(SUM(QT_ENTER_WEIGHT), 0) AS "qtEnterWeight",  <!-- 其它入库重量 -->
             COALESCE(SUM(ENTER_AMOUNT), 0) AS "enterAmount",  <!-- 入库数量 -->
             COALESCE(SUM(ENTER_WEIGHT), 0) AS "enterWeight",  <!-- 入库重量 -->
-            COALESCE(SUM(OUTER_AMOUNT), 0) AS "outerAmount",  <!-- 差异数量 -->
-            COALESCE(SUM(OUTER_WEIGHT), 0) AS "outerWeight",  <!-- 差异重量 -->
+            COALESCE(SUM(SC_OUTER_AMOUNT), 0) AS "scOuterAmount",  <!-- 生产领料数量 -->
+            COALESCE(SUM(SC_OUTER_WEIGHT), 0) AS "scOuterWeight",  <!-- 生产领料重量 -->
+            COALESCE(SUM(XS_OUTER_AMOUNT), 0) AS "xsOuterAmount",  <!-- 销售出库数量 -->
+            COALESCE(SUM(XS_OUTER_WEIGHT), 0) AS "xsOuterWeight",  <!-- 销售出库重量 -->
+            COALESCE(SUM(QT_OUTER_AMOUNT), 0) AS "qtOuterAmount",  <!-- 其它出库数量 -->
+            COALESCE(SUM(QT_OUTER_WEIGHT), 0) AS "qtOuterWeight",  <!-- 其它出库重量 -->
+            COALESCE(SUM(OUTER_AMOUNT), 0) AS "outerAmount",  <!-- 出库数量 -->
+            COALESCE(SUM(OUTER_WEIGHT), 0) AS "outerWeight",  <!-- 出库重量 -->
+            COALESCE(SUM(PD_DIFF_AMOUNT), 0) AS "pdDiffAmount",  <!-- 盘点差异数量 -->
+            COALESCE(SUM(PD_DIFF_WEIGHT), 0) AS "pdDiffWeight",  <!-- 盘点差异重量 -->
             COALESCE(SUM(END_AMOUNT), 0) AS "endAmount",  <!-- 期末数量 -->
             COALESCE(SUM(END_WEIGHT), 0) AS "endWeight"  <!-- 期末重量 -->
         FROM ${hpjxSchema}.T_HPKC009
@@ -116,7 +140,6 @@
         INSERT INTO ${hpjxSchema}.T_HPKC009 (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             DEP_CODE,  <!-- 部门编码 -->
-            KC_TYPE,  <!-- 库存类型：CG:采购，SC:生产，QT:其他 -->
             DATE_TYPE,  <!-- 日期类型：DAY:天，MONTH:月 -->
             DATE_PROC,  <!-- 日期 -->
             WH_CODE,  <!-- 仓库编码 -->
@@ -127,21 +150,37 @@
             INVENT_RECORD_ID,  <!-- 规格ID -->
             INIT_AMOUNT,  <!-- 期初数量 -->
             INIT_WEIGHT,  <!-- 期初重量 -->
+            CG_ENTER_AMOUNT,  <!-- 采购入库数量 -->
+            CG_ENTER_WEIGHT,  <!-- 采购入库重量 -->
+            SC_ENTER_AMOUNT,  <!-- 生产入库数量 -->
+            SC_ENTER_WEIGHT,  <!-- 生产入库重量 -->
+            QT_ENTER_AMOUNT,  <!-- 其它入库数量 -->
+            QT_ENTER_WEIGHT,  <!-- 其它入库重量 -->
             ENTER_AMOUNT,  <!-- 入库数量 -->
             ENTER_WEIGHT,  <!-- 入库重量 -->
+            SC_OUTER_AMOUNT,  <!-- 生产领料数量 -->
+            SC_OUTER_WEIGHT,  <!-- 生产领料重量 -->
+            XS_OUTER_AMOUNT,  <!-- 销售出库数量 -->
+            XS_OUTER_WEIGHT,  <!-- 销售出库重量 -->
+            QT_OUTER_AMOUNT,  <!-- 其它出库数量 -->
+            QT_OUTER_WEIGHT,  <!-- 其它出库重量 -->
             OUTER_AMOUNT,  <!-- 出库数量 -->
             OUTER_WEIGHT,  <!-- 出库重量 -->
+            PD_DIFF_AMOUNT,  <!-- 盘点差异数量 -->
+            PD_DIFF_WEIGHT,  <!-- 盘点差异重量 -->
             END_AMOUNT,  <!-- 期末数量 -->
             END_WEIGHT,  <!-- 期末重量 -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #depCode#, #kcType#, #dateType#, #dateProc#, #whCode#,
-            #whName#, #inventType#, #inventCode#, #inventName#, #inventRecordId#,
-            #initAmount#, #initWeight#, #enterAmount#, #enterWeight#, #outerAmount#,
-            #outerWeight#, #endAmount#, #endWeight#, #createdBy#, #createdName#,
-            #createdTime#
+            #companyCode#, #depCode#, #dateType#, #dateProc#, #whCode#, #whName#,
+            #inventType#, #inventCode#, #inventName#, #inventRecordId#, #initAmount#,
+            #initWeight#, #cgEnterAmount#, #cgEnterWeight#, #scEnterAmount#, #scEnterWeight#,
+            #qtEnterAmount#, #qtEnterWeight#, #enterAmount#, #enterWeight#, #scOuterAmount#,
+            #scOuterWeight#, #xsOuterAmount#, #xsOuterWeight#, #qtOuterAmount#, #qtOuterWeight#,
+            #outerAmount#, #outerWeight#, #pdDiffAmount#, #pdDiffWeight#, #endAmount#,
+            #endWeight#, #createdBy#, #createdName#, #createdTime#
         )
     </insert>
 

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

@@ -4,20 +4,23 @@
 
     <sql id="column">
         ID as "id",
-        COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
+        COMPANY_CODE as "companyCode",  <!-- 企业编码 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
-        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
-        INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
+        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
+        INVENT_NAME as "inventName",  <!-- 物料名称 -->
         INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
         CREATED_BY as "createdBy",  <!-- 创建人 -->
+        CREATED_NAME as "createdName",  <!-- 创建人名称 -->
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
+        UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        VERSION as "version"
+        VERSION as "version" <!-- 版本号 -->
     </sql>
 
 	<sql id="condition">
@@ -114,6 +117,7 @@
 	<insert id="insert">
 		INSERT INTO hpjx.T_HPKC010 (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
+            DEP_CODE,  <!-- 部门编码 预留 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
             INVENT_TYPE,  <!-- 存货类型 -->
@@ -128,7 +132,7 @@
             UPDATED_TIME,  <!-- 更新时间 -->
             VERSION
         ) VALUES (
-            #companyCode#, #whCode#, #whName#, #inventType#,
+            #companyCode#, #depCode#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #weight#,
             #createdBy#, #createdTime#, #updatedBy#,
             #updatedTime#, #version#

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC010A.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="tHpkc010a">
+
+    <sql id="column">
+        ID as "id",
+        COMPANY_CODE as "companyCode",  <!-- 企业编码 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 -->
+        DATE_PROC as "dateProc",  <!-- 日期 -->
+        WH_CODE as "whCode",  <!-- 仓库编码 -->
+        WH_NAME as "whName",  <!-- 仓库名称 -->
+        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
+        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
+        INVENT_NAME as "inventName",  <!-- 物料名称 -->
+        INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
+        AMOUNT as "amount",  <!-- 数量 -->
+        WEIGHT as "weight",  <!-- 重量 -->
+        CREATED_BY as "createdBy",  <!-- 创建人 -->
+        CREATED_NAME as "createdName",  <!-- 创建人名称 -->
+        CREATED_TIME as "createdTime",  <!-- 创建时间 -->
+        UPDATED_BY as "updatedBy",  <!-- 更新人 -->
+        UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
+        UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
+        VERSION as "version" <!-- 版本号 -->
+    </sql>
+
+	<sql id="condition">
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="dateProc">
+			DATE_PROC = #dateProc#
+		</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="inventRecordId">
+			INVENT_RECORD_ID = #inventRecordId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="amount">
+			AMOUNT = #amount#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="weight">
+			WEIGHT = #weight#
+		</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="version">
+			VERSION = #version#
+		</isNotEmpty>
+	</sql>
+
+    <sql id="order">
+        <dynamic prepend="ORDER BY">
+            <isNotEmpty property="order">
+                $orderBy$
+            </isNotEmpty>
+            <isEmpty property="order">
+                ID asc
+            </isEmpty>
+        </dynamic>
+    </sql>
+
+    <select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC010A">
+        SELECT
+        <include refid="column"/>
+        FROM ${hpjxSchema}.T_HPKC010A
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="order"/>
+    </select>
+
+    <select id="count" resultClass="int">
+        SELECT COUNT(*) FROM ${hpjxSchema}.T_HPKC010A WHERE 1=1
+        <include refid="condition"/>
+    </select>
+
+    <!-- 备份数据 -->
+    <insert id="backup">
+        INSERT INTO ${hpjxSchema}.T_HPKC010A (
+            COMPANY_CODE, DEP_CODE, DATE_PROC, WH_CODE, WH_NAME, INVENT_TYPE,
+            INVENT_CODE, INVENT_NAME, INVENT_RECORD_ID, AMOUNT, WEIGHT,
+            CREATED_BY, CREATED_NAME, CREATED_TIME, UPDATED_BY, UPDATED_NAME,
+            UPDATED_TIME, VERSION
+        )
+        SELECT
+            COMPANY_CODE, DEP_CODE, #dateProc#, WH_CODE, WH_NAME, INVENT_TYPE,
+            INVENT_CODE, INVENT_NAME, INVENT_RECORD_ID, AMOUNT, WEIGHT,
+            CREATED_BY, CREATED_NAME, CREATED_TIME, UPDATED_BY, UPDATED_NAME,
+            UPDATED_TIME, VERSION
+        FROM ${hpjxSchema}.T_HPKC010
+    </insert>
+
+</sqlMap>

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml

@@ -55,10 +55,10 @@
 
     <sql id="customCondition">
         <isNotEmpty prepend=" AND " property="createdDateFrom">
-            A.CREATED_TIME &gt;= CONCAT(REPLACE(#depositDateFrom#, '-', ''), '000000')
+            A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="createdDateTo">
-            A.CREATED_TIME &lt;= CONCAT(REPLACE(#depositDateTo#, '-', ''), '235959')
+            A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
         </isNotEmpty>
     </sql>
 

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

@@ -34,37 +34,65 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
-			<EF:EFComboColumn cname="库存类型" ename="kcType" enable="false" width="80" align="center">
-				<EF:EFCodeOption codeName="hpjx.hpkc.kcType"/>
-			</EF:EFComboColumn>
-			<EF:EFColumn cname="日期" ename="dateProc" enable="false" width="90" align="center"/>
-			<EF:EFComboColumn cname="存货类型" ename="inventType" enable="false" width="90" align="center">
+			<EF:EFColumn ename="dateProc" cname="日期" enable="false" width="90" align="center"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="90" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn cname="仓库名称" ename="whCode" enable="false" width="100" align="center"
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFComboColumn cname="存货名称" ename="inventCode" enable="false" width="100" align="center"
+			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="100" align="center"
 			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFColumn cname="规格" ename="spec" enable="false" width="120"/>
-			<EF:EFColumn cname="期初数量" ename="initAmount" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
+			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="initAmount" cname="期初数量" enable="false" width="100" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="initWeight" cname="期初重量" enable="false" width="100" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="cgEnterAmount" cname="采购入库数量" enable="false" width="100" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="cgEnterWeight" cname="采购入库重量" enable="false" width="100" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="scEnterAmount" cname="生产入库数量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="scEnterWeight" cname="生产入库重量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="qtEnterAmount" cname="其它入库数量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="qtEnterWeight" cname="其它入库重量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="enterAmount" cname="入库数量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="enterWeight" cname="入库重量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="scOuterAmount" cname="生产领料数量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="scOuterWeight" cname="生产领料重量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="xsOuterAmount" cname="销售出库数量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="xsOuterWeight" cname="销售出库重量" enable="false" width="90" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="qtOuterAmount" cname="其它出库数量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="期初重量" ename="initWeight" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="qtOuterWeight" cname="其它出库重量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="入库数量" ename="stockinAmount" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="outerAmount" cname="出库数量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="入库重量" ename="stockinWeight" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="outerWeight" cname="出库重量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="出库数量" ename="stockoutAmount" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="pdDiffAmount" cname="盘点差异数量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="出库重量" ename="stockoutWeight" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="pdDiffWeight" cname="盘点差异重量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="期末数量" ename="endAmount" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="endAmount" cname="期末数量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
-			<EF:EFColumn cname="期末重量" ename="endWeight" enable="false" width="90" align="right" format="{0:N3}"
+			<EF:EFColumn ename="endWeight" cname="期末重量" enable="false" width="90" align="right" format="{0:N3}"
 			             sumType="all"/>
 		</EF:EFGrid>
 	</EF:EFRegion>

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

@@ -247,6 +247,9 @@ $(function () {
                 let $iframe = uploadFileWindow.element.children("iframe");
                 let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
                 let uploadFile = iframejQuery("#fileDocId").val();
+	            if (isBlank(uploadFile)) {
+		            return;
+	            }
                 let inEiInfo = new EiInfo();
                 inEiInfo.set("result-0-id", rowId);
                 inEiInfo.set("result-0-filePath1", uploadFile);

src/main/webapp/HP/SC/HPSC002A.js

@@ -22,6 +22,9 @@ $(function () {
 				let $iframe = uploadFileWindow.element.children("iframe");
 				let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
 				let uploadFile = iframejQuery("#fileDocId").val();
+				if (isBlank(uploadFile)) {
+					return;
+				}
 				let inEiInfo = new EiInfo();
 				inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val());
 				inEiInfo.set("result-0-docId", uploadFile);

src/main/webapp/HP/ZL/HPZL001.js

@@ -51,6 +51,9 @@ $(function() {
 				let $iframe = uploadFileWindow.element.children("iframe");
 				let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
 				let uploadFile = iframejQuery("#fileDocId").val();
+				if (isBlank(uploadFile)) {
+					return;
+				}
 				let inEiInfo = new EiInfo();
 				inEiInfo.set("result-0-id", rowId);
 				inEiInfo.set("result-0-affix", uploadFile);