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

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

@@ -180,7 +180,7 @@ public class ServiceHPKC003 extends ServiceBase {
 	public HPSC004 synchronousPlan(HPKC003 hpkc003) {
 		HPSC004 hpsc004 = (HPSC004) this.dao.get("HPSC004.queryDetail","productionOrderNo",hpkc003.getProductionOrderNo());
 		if (hpsc004 != null) {
-			BigDecimal actualCompletionNum = hpkc003.getAmount().add(hpsc004.getNum());
+			BigDecimal actualCompletionNum = hpkc003.getAmount().add(hpsc004.getActualCompletionNum());
 			BigDecimal actualCompletionUnitWt = hpkc003.getWeight().add(hpsc004.getActualCompletionUnitWt());
 			hpsc004.setActualCompletionNum(actualCompletionNum);
 			hpsc004.setActualCompletionUnitWt(actualCompletionUnitWt);

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003.java

@@ -40,6 +40,9 @@ public class HPSC003 extends DaoEPBase {
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_SCHEDULE = "schedule";
 
+	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";
+
+
 	public static final String COL_ID = "ID";    		
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_PROJ_TYPE = "PROJ_TYPE";    		/* 项目类型*/
@@ -57,6 +60,7 @@ public class HPSC003 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 	public static final String COL_REMARK = "REMARK";    		/* 备注*/
+	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";
 
 	public static final String QUERY = "t_hpsc003.query";
 	public static final String COUNT = "t_hpsc003.count";
@@ -84,6 +88,8 @@ public class HPSC003 extends DaoEPBase {
 
 	private String schedule = "";
 
+	private Integer inventRecordId = new Integer(0);
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -163,6 +169,10 @@ public class HPSC003 extends DaoEPBase {
 		eiColumn.setDescName("生产完工进度");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
+		eiColumn.setDescName("项目档案ID");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -438,6 +448,23 @@ public class HPSC003 extends DaoEPBase {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	/**
+	 * get the inventRecordId - 项目档案ID.
+	 * @return the inventRecordId
+	 */
+	public Integer getInventRecordId() {
+		return this.inventRecordId;
+	}
+
+	/**
+	 * set the inventRecordId - 项目档案ID.
+	 *
+	 * @param inventRecordId - 项目档案ID
+	 */
+	public void setInventRecordId(Integer inventRecordId) {
+		this.inventRecordId = inventRecordId;
+	}
 	/**
 	 * get the value from Map.
 	 *
@@ -464,6 +491,7 @@ public class HPSC003 extends DaoEPBase {
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SCHEDULE)), schedule));
+		setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 
 	}
 
@@ -492,6 +520,7 @@ public class HPSC003 extends DaoEPBase {
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_SCHEDULE, StringUtils.toString(schedule, eiMetadata.getMeta(FIELD_SCHEDULE)));
+		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java

@@ -58,6 +58,7 @@ public class HPSC004 extends DaoEPBase {
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
+	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";
 
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -95,6 +96,7 @@ public class HPSC004 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_REMARK = "REMARK";    		/* 备注*/
+	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";
 
 	public static final String QUERY = "t_hpsc004.query";
 	public static final String COUNT = "t_hpsc004.count";
@@ -137,6 +139,7 @@ public class HPSC004 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedTime ;		/* 更新时间*/
 	private String remark = " ";		/* 备注*/
+	private Integer inventRecordId = new Integer(0);
 
 	/**
 	 * initialize the metadata.
@@ -294,6 +297,9 @@ public class HPSC004 extends DaoEPBase {
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
+		eiColumn.setDescName("项目档案ID");
+		eiMetadata.addMeta(eiColumn);
 
 	}
 
@@ -864,6 +870,23 @@ public class HPSC004 extends DaoEPBase {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	/**
+	 * get the inventRecordId - 项目档案ID.
+	 * @return the inventRecordId
+	 */
+	public Integer getInventRecordId() {
+		return this.inventRecordId;
+	}
+
+	/**
+	 * set the inventRecordId - 项目档案ID.
+	 *
+	 * @param inventRecordId - 项目档案ID
+	 */
+	public void setInventRecordId(Integer inventRecordId) {
+		this.inventRecordId = inventRecordId;
+	}
 	/**
 	 * get the value from Map.
 	 *
@@ -907,6 +930,7 @@ public class HPSC004 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedTime(StringUtils.toString(map.get(FIELD_UPDATED_TIME)));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
+		setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 	}
 
 	/**
@@ -951,6 +975,7 @@ public class HPSC004 extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
+		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java

@@ -47,6 +47,8 @@ public class HPSC005 extends DaoEPBase {
 	public static final String FIELD_FILE_PATH3 = "filePath3";    		/* 文件地址3*/
 	public static final String FIELD_FILE_PATH4 = "filePath4";    		/* 文件地址4*/
 	public static final String FIELD_FILE_PATH5 = "filePath5";    		/* 文件地址5*/
+	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";
+
 	public static final String COL_ID = "ID";    		
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
@@ -72,6 +74,7 @@ public class HPSC005 extends DaoEPBase {
 	public static final String COL_FILE_PATH3 = "FILE_PATH3";    		/* 文件地址3*/
 	public static final String COL_FILE_PATH4 = "FILE_PATH4";    		/* 文件地址4*/
 	public static final String COL_FILE_PATH5 = "FILE_PATH5";    		/* 文件地址5*/
+	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";
 
 	public static final String QUERY = "t_hpsc005.query";
 	public static final String COUNT = "t_hpsc005.count";
@@ -104,6 +107,8 @@ public class HPSC005 extends DaoEPBase {
 	private String filePath3 = " ";		/* 文件地址3*/
 	private String filePath4 = " ";		/* 文件地址4*/
 	private String filePath5 = " ";		/* 文件地址5*/
+	private Integer inventRecordId = new Integer(0);
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -213,6 +218,10 @@ public class HPSC005 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_FILE_PATH5);
 		eiColumn.setDescName("文件地址5");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
+		eiColumn.setDescName("项目档案ID");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -624,6 +633,23 @@ public class HPSC005 extends DaoEPBase {
 	}
 
 	/**
+	 * get the inventRecordId - 项目档案ID.
+	 * @return the inventRecordId
+	 */
+	public Integer getInventRecordId() {
+		return this.inventRecordId;
+	}
+
+	/**
+	 * set the inventRecordId - 项目档案ID.
+	 *
+	 * @param inventRecordId - 项目档案ID
+	 */
+	public void setInventRecordId(Integer inventRecordId) {
+		this.inventRecordId = inventRecordId;
+	}
+
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -656,6 +682,7 @@ public class HPSC005 extends DaoEPBase {
 		setFilePath3(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH3)), filePath3));
 		setFilePath4(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH4)), filePath4));
 		setFilePath5(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH5)), filePath5));
+		setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 	}
 
 	/**
@@ -690,6 +717,7 @@ public class HPSC005 extends DaoEPBase {
 		map.put(FIELD_FILE_PATH3, StringUtils.toString(filePath3, eiMetadata.getMeta(FIELD_FILE_PATH3)));
 		map.put(FIELD_FILE_PATH4, StringUtils.toString(filePath4, eiMetadata.getMeta(FIELD_FILE_PATH4)));
 		map.put(FIELD_FILE_PATH5, StringUtils.toString(filePath5, eiMetadata.getMeta(FIELD_FILE_PATH5)));
+		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 
 		return map;
 	}

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

@@ -86,6 +86,7 @@
 				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 				PROJ_NAME	as "projName",  <!-- 项目名称 -->
 				PLAN_INFO_NO	as "planInfoNo",  <!-- 生产计划单号 -->
+		INVENT_RECORD_ID	as "inventRecordId",
 		PRDT_TYPE	as "prdtType",
 				PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
 				PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
@@ -178,6 +179,7 @@
 										PROJ_CODE,  <!-- 项目编码 -->
 										PROJ_NAME,  <!-- 项目名称 -->
 										PLAN_INFO_NO,  <!-- 生产计划单号 -->
+		INVENT_RECORD_ID,
 		PRDT_TYPE,
 										PRDT_CODE,  <!-- 产品编码 -->
 										PRDT_NAME,  <!-- 产品名称 -->
@@ -190,7 +192,7 @@
 										DEP_CODE,  <!-- 部门编码 -->
 										REMARK  <!-- 备注 -->
 										)
-	    VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
+	    VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#,#inventRecordId#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
 	</insert>
 
 	<delete id="delete">

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

@@ -162,6 +162,7 @@
 				LEAF	as "leaf",  <!-- 是否有叶子节点 -->
 				SORT	as "sort",  <!-- 排序字段 -->
 				ICON	as "icon",  <!-- 图片地址 -->
+		INVENT_RECORD_ID	as "inventRecordId",
 		PRDT_TYPE	as "prdtType",
 				PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
 				PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
@@ -317,6 +318,7 @@
 										LEAF,  <!-- 是否有叶子节点 -->
 										SORT,  <!-- 排序字段 -->
 										ICON,  <!-- 图片地址 -->
+		INVENT_RECORD_ID,
 		PRDT_TYPE,
 										PRDT_CODE,  <!-- 产品编码 -->
 										PRDT_NAME,  <!-- 产品名称 -->
@@ -341,7 +343,7 @@
 										UPDATED_TIME,  <!-- 更新时间 -->
 										REMARK  <!-- 备注 -->
 										)
-	    VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
+	    VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#,#inventRecordId#, #prdtType#, #prdtCode#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
 	</insert>
 
 	<delete id="delete">
@@ -415,6 +417,7 @@
 		LEAF	as "leaf",  <!-- 是否有叶子节点 -->
 		SORT	as "sort",  <!-- 排序字段 -->
 		ICON	as "icon",  <!-- 图片地址 -->
+		INVENT_RECORD_ID	as "inventRecordId",
 		PRDT_TYPE	as "prdtType",
 		PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
 		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->

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

@@ -117,6 +117,7 @@
 				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 				PROJ_NAME	as "projName",  <!-- 项目名称 -->
 				PRODUCTION_ORDER_NO	as "productionOrderNo",  <!-- 生产订单号 -->
+		INVENT_RECORD_ID	as "inventRecordId",
 		PRDT_TYPE	as "prdtType",
 				PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
 				PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
@@ -221,6 +222,7 @@
 										PROJ_CODE,  <!-- 项目编码 -->
 										PROJ_NAME,  <!-- 项目名称 -->
 										PRODUCTION_ORDER_NO,  <!-- 生产订单号 -->
+		INVENT_RECORD_ID,
 		PRDT_TYPE,
 										PRDT_CODE,  <!-- 产品编码 -->
 										PRDT_NAME,  <!-- 产品名称 -->
@@ -242,7 +244,7 @@
 		FILE_PATH4,  <!-- 文件地址4 -->
 		FILE_PATH5  <!-- 文件地址5 -->
 										)
-	    VALUES (#id#, #companyCode#, #projCode#, #projName#, #productionOrderNo#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #num#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#)
+	    VALUES (#id#, #companyCode#, #projCode#, #projName#, #productionOrderNo#,#inventRecordId#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #num#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#)
 	</insert>
 
 	<delete id="delete">