Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java

@@ -6,10 +6,9 @@ import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.ValidFlagEnum;
 import com.baosight.hggp.hg.constant.HGConstant;
-import com.baosight.hggp.hg.pz.domain.HGPZ004;
-import com.baosight.hggp.hg.pz.domain.HGPZ005;
-import com.baosight.hggp.hg.pz.domain.HGPZ007;
-import com.baosight.hggp.hg.pz.domain.HGPZ009;
+import com.baosight.hggp.hg.pz.domain.*;
+import com.baosight.hggp.hg.sc.domain.HGSC001A;
+import com.baosight.hggp.hg.sc.domain.HGSC005A;
 import com.baosight.hggp.hg.sj.domain.HGSJ003;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.common.ed.domain.TEDCM01;
@@ -391,4 +390,21 @@ public class HGPZTools {
 			}
 		}
 	}
+
+	public static class HgPz005A{
+
+		/**
+		 * 通过存货编码查询存货工序*
+		 * @param inventCode
+		 * @return
+		 */
+		public static List<HGPZ005A> queryByInventCode(String inventCode){
+			AssertUtils.isEmpty(inventCode, "存货编码不能为空！");
+			Map paramMap = new HashMap();
+			paramMap.put(HGPZ005A.FIELD_INVENT_CODE, inventCode);
+			List<HGPZ005A> results = DaoBase.getInstance().query(HGPZ005A.QUERY, paramMap);
+			return CollectionUtils.isEmpty(results) ? null : results;
+		}
+
+	}
 }

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC005.java

@@ -89,7 +89,7 @@ public class HGSC005 extends DaoEPBase {
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 
-	private List<HGSC005A> hgsc005AList;
+//	private List<HGSC005A> hgsc005AList;
 
 	/**
 	 * initialize the metadata.
@@ -482,13 +482,13 @@ public class HGSC005 extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 
-	public List<HGSC005A> getHgsc005AList() {
-		return hgsc005AList;
-	}
-
-	public void setHgsc005AList(List<HGSC005A> hgsc005AList) {
-		this.hgsc005AList = hgsc005AList;
-	}
+//	public List<HGSC005A> getHgsc005AList() {
+//		return hgsc005AList;
+//	}
+//
+//	public void setHgsc005AList(List<HGSC005A> hgsc005AList) {
+//		this.hgsc005AList = hgsc005AList;
+//	}
 
 	/**
 	 * get the value from Map.

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC005A.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-16 19:32:42
+		Generate time : 2024-05-17 17:15:03
    		Version :  1.0
 		schema : hggp
 		tableName : HGSC005A
 		 id  BIGINT   NOT NULL   primarykey,
+		 mat_id  BIGINT   NOT NULL,
 		 mat_detail_id  BIGINT   NOT NULL,
 		 tech_flow_id  BIGINT,
+		 tech_flow_name  BIGINT,
+		 invent_process_id  BIGINT,
+		 process_name  VARCHAR,
 		 company_code  VARCHAR   NOT NULL,
 		 company_name  VARCHAR   NOT NULL,
 		 dep_code  VARCHAR,
@@ -14,6 +18,7 @@
 		 proj_code  VARCHAR,
 		 proj_name  VARCHAR,
 		 plan_code  VARCHAR,
+		 product_type  TINYINT,
 		 product_code  VARCHAR,
 		 product_name  VARCHAR,
 		 finish_date  VARCHAR,
@@ -36,12 +41,24 @@
 		<isNotEmpty prepend=" AND " property="id">
 			id = #id#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="matId">
+			mat_id = #matId#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="matDetailId">
 			mat_detail_id = #matDetailId#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="techFlowId">
 			tech_flow_id = #techFlowId#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="techFlowName">
+			tech_flow_name = #techFlowName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventProcessId">
+			invent_process_id = #inventProcessId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="processName">
+			process_name = #processName#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			company_code = #companyCode#
 		</isNotEmpty>
@@ -63,6 +80,9 @@
 		<isNotEmpty prepend=" AND " property="planCode">
 			plan_code = #planCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="productType">
+			product_type = #productType#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productCode">
 			product_code = #productCode#
 		</isNotEmpty>
@@ -114,8 +134,12 @@
 			resultClass="com.baosight.hggp.hg.sc.domain.HGSC005A">
 		SELECT
 		id	as "id",
+		mat_id	as "matId",  <!-- 物料清单ID -->
 		mat_detail_id	as "matDetailId",  <!-- 物料清单明细ID -->
 		tech_flow_id	as "techFlowId",  <!-- 工艺流程ID -->
+		tech_flow_name	as "techFlowName",  <!-- 工艺流程名称 -->
+		invent_process_id	as "inventProcessId",  <!-- 存货工序ID，对应HGPZ005A.id -->
+		process_name	as "processName",  <!-- 工序名称 -->
 		company_code	as "companyCode",  <!-- 公司编码 -->
 		company_name	as "companyName",  <!-- 公司名称 -->
 		dep_code	as "depCode",  <!-- 部门编码 -->
@@ -123,6 +147,7 @@
 		proj_code	as "projCode",  <!-- 项目编码 -->
 		proj_name	as "projName",  <!-- 项目名称 -->
 		plan_code	as "planCode",  <!-- 计划编码 -->
+		product_type	as "productType",  <!-- 产品类型 -->
 		product_code	as "productCode",  <!-- 产品编号 -->
 		product_name	as "productName",  <!-- 产品名称 -->
 		finish_date	as "finishDate",  <!-- 完工日期 -->
@@ -160,12 +185,24 @@
 		<isNotEmpty prepend=" AND " property="id">
 			id = #id#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="matId">
+			mat_id = #matId#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="matDetailId">
 			mat_detail_id = #matDetailId#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="techFlowId">
 			tech_flow_id = #techFlowId#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="techFlowName">
+			tech_flow_name = #techFlowName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventProcessId">
+			invent_process_id = #inventProcessId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="processName">
+			process_name = #processName#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			company_code = #companyCode#
 		</isNotEmpty>
@@ -187,6 +224,9 @@
 		<isNotEmpty prepend=" AND " property="planCode">
 			plan_code = #planCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="productType">
+			product_type = #productType#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productCode">
 			product_code = #productCode#
 		</isNotEmpty>
@@ -236,8 +276,12 @@
 
 	<insert id="insert">
 		INSERT INTO ${hggpSchema}.HGSC005A (id,
+		mat_id,  <!-- 物料清单ID -->
 		mat_detail_id,  <!-- 物料清单明细ID -->
 		tech_flow_id,  <!-- 工艺流程ID -->
+		tech_flow_name,  <!-- 工艺流程名称 -->
+		invent_process_id,  <!-- 存货工序ID，对应HGPZ005A.id -->
+		process_name,  <!-- 工序名称 -->
 		company_code,  <!-- 公司编码 -->
 		company_name,  <!-- 公司名称 -->
 		dep_code,  <!-- 部门编码 -->
@@ -245,6 +289,7 @@
 		proj_code,  <!-- 项目编码 -->
 		proj_name,  <!-- 项目名称 -->
 		plan_code,  <!-- 计划编码 -->
+		product_type,  <!-- 产品类型 -->
 		product_code,  <!-- 产品编号 -->
 		product_name,  <!-- 产品名称 -->
 		finish_date,  <!-- 完工日期 -->
@@ -261,7 +306,7 @@
 		updated_name,  <!-- 修改人名称 -->
 		updated_time  <!-- 更新时间 -->
 		)
-		VALUES (#id#, #matDetailId#, #techFlowId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #planCode#, #productCode#, #productName#, #finishDate#, #planStartDate#, #planEndDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
+		VALUES (#id#, #matId#, #matDetailId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processName#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #planCode#, #productType#, #productCode#, #productName#, #finishDate#, #planStartDate#, #planEndDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
 	</insert>
 
 	<delete id="delete">
@@ -269,16 +314,15 @@
 			id = #id#
 	</delete>
 
-	<delete id="deleteByMatDetailId">
-		DELETE FROM ${hggpSchema}.HGSC005A WHERE
-			mat_detail_id = #matDetailId#
-	</delete>
-
 	<update id="update">
 		UPDATE ${hggpSchema}.HGSC005A
 		SET
+		mat_id	= #matId#,   <!-- 物料清单ID -->
 		mat_detail_id	= #matDetailId#,   <!-- 物料清单明细ID -->
 		tech_flow_id	= #techFlowId#,   <!-- 工艺流程ID -->
+		tech_flow_name	= #techFlowName#,   <!-- 工艺流程名称 -->
+		invent_process_id	= #inventProcessId#,   <!-- 存货工序ID，对应HGPZ005A.id -->
+		process_name	= #processName#,   <!-- 工序名称 -->
 		company_code	= #companyCode#,   <!-- 公司编码 -->
 		company_name	= #companyName#,   <!-- 公司名称 -->
 		dep_code	= #depCode#,   <!-- 部门编码 -->
@@ -286,6 +330,7 @@
 		proj_code	= #projCode#,   <!-- 项目编码 -->
 		proj_name	= #projName#,   <!-- 项目名称 -->
 		plan_code	= #planCode#,   <!-- 计划编码 -->
+		product_type	= #productType#,   <!-- 产品类型 -->
 		product_code	= #productCode#,   <!-- 产品编号 -->
 		product_name	= #productName#,   <!-- 产品名称 -->
 		finish_date	= #finishDate#,   <!-- 完工日期 -->