2024-05-17 存货档案功能优化

src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ005A.java

@@ -35,6 +35,7 @@ public class HGPZ005A extends DaoEPBase {
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 公司编码*/
 	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_PROCESS_CODE = "processCode";    		/* 工序编码*/
 	public static final String FIELD_PROCESS_NAME = "processName";    		/* 工序名称*/
 	public static final String FIELD_COMPOSING_COEFF = "composingCoeff";    		/* 排产系数*/
@@ -52,6 +53,7 @@ public class HGPZ005A extends DaoEPBase {
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 更新人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
 	public static final String COL_PROCESS_CODE = "PROCESS_CODE";    		/* 工序编码*/
 	public static final String COL_PROCESS_NAME = "PROCESS_NAME";    		/* 工序名称*/
 	public static final String COL_COMPOSING_COEFF = "COMPOSING_COEFF";    		/* 排产系数*/
@@ -78,6 +80,7 @@ public class HGPZ005A extends DaoEPBase {
 	private Integer deleteFlag = 0;	/* 是否删除0.否1.是*/
 	private String companyCode = " ";		/* 公司编码*/
 	private String companyName = " ";		/* 公司名称*/
+	private String inventCode = " ";;	/* 存货编码*/
 	private String processCode = " ";		/* 工序编码*/
 	private String processName = " ";		/* 工序名称*/
 	private BigDecimal composingCoeff = new BigDecimal(0);	/* 排产系数*/
@@ -140,6 +143,10 @@ public class HGPZ005A extends DaoEPBase {
 		eiColumn.setDescName("公司名称");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_CODE);
+		eiColumn.setDescName("存货编码");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_PROCESS_CODE);
 		eiColumn.setDescName("工序编码");
 		eiMetadata.addMeta(eiColumn);
@@ -357,6 +364,14 @@ public class HGPZ005A extends DaoEPBase {
 		this.companyName = companyName;
 	}
 
+	public String getInventCode() {
+		return inventCode;
+	}
+
+	public void setInventCode(String inventCode) {
+		this.inventCode = inventCode;
+	}
+
 	/**
 	 * get the processCode - 工序编码.
 	 * @return the processCode
@@ -473,6 +488,7 @@ public class HGPZ005A extends DaoEPBase {
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
+		setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
 		setProcessCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROCESS_CODE)), processCode));
 		setProcessName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROCESS_NAME)), processName));
 		setComposingCoeff(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COMPOSING_COEFF)), composingCoeff));
@@ -500,6 +516,7 @@ public class HGPZ005A extends DaoEPBase {
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
 		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
+		map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
 		map.put(FIELD_PROCESS_CODE, StringUtils.toString(processCode, eiMetadata.getMeta(FIELD_PROCESS_CODE)));
 		map.put(FIELD_PROCESS_NAME, StringUtils.toString(processName, eiMetadata.getMeta(FIELD_PROCESS_NAME)));
 		map.put(FIELD_COMPOSING_COEFF, StringUtils.toString(composingCoeff, eiMetadata.getMeta(FIELD_COMPOSING_COEFF)));

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

@@ -316,6 +316,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 			hgpz005A.setCompanyName(hgsj002.getFactoryName());
 			hgpz005A.setProcessCode(hgsj002a.getProcessCode());
 			hgpz005A.setProcessName(hgsj002a.getProcessName());
+			hgpz005A.setInventCode(hppz005.getInventCode());
 			hgpz005A.setUnitCoeff(BigDecimal.ONE);
 			hgpz005A.setComposingCoeff(BigDecimal.ONE);
 			hgpz005A.setParentId(hppz005.getId());

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

@@ -60,6 +60,9 @@
 		<isNotEmpty prepend=" AND " property="companyName">
 			COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventCode">
+			INVENT_CODE = #inventCode#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="processCode">
 			PROCESS_CODE = #processCode#
 		</isNotEmpty>
@@ -95,6 +98,7 @@
 			DELETE_FLAG	as "deleteFlag",  <!-- 是否删除0.否1.是 -->
 			COMPANY_CODE as "companyCode", <!-- 公司编码 -->
 			COMPANY_NAME as "companyName", <!-- 公司名称 -->
+			INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
 			PROCESS_CODE	as "processCode",  <!-- 工序编码 -->
 			PROCESS_NAME	as "processName",  <!-- 工序名称 -->
 			COMPOSING_COEFF	as "composingCoeff",  <!-- 排产系数 -->
@@ -183,6 +187,7 @@
 		DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
 		COMPANY_CODE, <!-- 公司编码 -->
 		COMPANY_NAME, <!-- 公司名称 -->
+		INVENT_CODE,
 		PROCESS_CODE,  <!-- 工序编码 -->
 		PROCESS_NAME,  <!-- 工序名称 -->
 		COMPOSING_COEFF,  <!-- 排产系数 -->
@@ -190,7 +195,7 @@
 		PROCESS_CLASS,  <!-- 工序类别 -->
 		PARENT_ID  <!-- 上级ID -->
 		)
-		VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #processCode#, #processName#, #composingCoeff#, #unitCoeff#, #processClass#, #parentId#)
+		VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #inventCode#, #processCode#, #processName#, #composingCoeff#, #unitCoeff#, #processClass#, #parentId#)
 	</insert>
 
 	<delete id="delete">
@@ -216,6 +221,7 @@
 		DELETE_FLAG	= #deleteFlag#,   <!-- 是否删除0.否1.是 -->
 		COMPANY_CODE = #companyCode#, <!-- 公司编码 -->
 		COMPANY_NAME = #companyName#, <!-- 公司名称 -->
+		INVENT_CODE = #inventCode#,
 		PROCESS_CODE	= #processCode#,   <!-- 工序编码 -->
 		PROCESS_NAME	= #processName#,   <!-- 工序名称 -->
 		COMPOSING_COEFF	= #composingCoeff#,   <!-- 排产系数 -->

src/main/webapp/HG/PZ/HGPZ005.js

@@ -16,7 +16,7 @@ $(function() {
 				let template = '';
 				if (item.id){
 					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-						+ 'onclick="showFlowDetail(' + item.id + ')"  >工艺流程</a>';
+						+ 'onclick="showFlowDetail(' + item.id + ',\''+item.inventCode+'\')"  >工艺流程</a>';
 					if (item.flowId>0){
 						template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 							+ 'onclick="showDetail(' + item.id + ')"  >工艺流程详情</a>';
@@ -223,9 +223,9 @@ function showDetail(id) {
 	});
 }
 
-function showFlowDetail(id) {
+function showFlowDetail(id,inventCode) {
 	JSColorbox.open({
-		href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentId=" + id,
+		href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentId=" + id+"&inqu_status-0-inventCode="+inventCode,
 		title: "<div style='text-align: center;'>工艺流程</div>",
 		width: "75%",
 		height: "80%",
@@ -239,6 +239,7 @@ function showFlowDetail(id) {
 function cllback(result) {
 	let inEiInfo = new EiInfo();
 	inEiInfo.set("result-0-id", result.id);
+	inEiInfo.set("result-0-inventCode", result.inventCode);
 	inEiInfo.set("result-0-flow", result.rows);
 	EiCommunicator.send('HGPZ005', 'updateFlowId', inEiInfo, {
 		onSuccess(ei) {

src/main/webapp/HG/PZ/HGPZ005B.js

@@ -55,8 +55,9 @@ $(function (){
 
     $("#result").on("click", function () {
         let id = $("#inqu_status-0-parentId").val();
+        let inventCode = $("#inqu_status-0-inventCode").val();
         let rows = resultGrid.getCheckedRows();
-        parent.JSColorbox.setValueCallback({"id":id,"rows":rows[0]});
+        parent.JSColorbox.setValueCallback({"id":id,"inventCode":inventCode,"rows":rows[0]});
         parent.JSColorbox.close();
     });
 })

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

@@ -21,6 +21,7 @@
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="parentId" cname="上级ID"  colWidth="3" type="hidden"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="inventCode" cname="存货编码"  colWidth="3" type="hidden"/>
         </div>
     </EF:EFRegion>