1.生产任务页面优化

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

@@ -27,14 +27,14 @@ public class HPSC005B extends HPSC005 {
 	public static final String FIELD_PROD_TASK_NO = "prodTaskNo";
 	public static final String FIELD_PROD_ORDER_NO = "prodOrderNo";
 	public static final String FIELD_COMPLETE_NUM = "completeNum";    		/* 已完成数量*/
-
+	public static final String FIELD_UN_COMPLETE_NUM = "unCompleteNum";    		/* 剩余数量*/
 	public static final String FIELD_ZL_PROD_TASK_NO = "zlprodTaskNo";    		/* 质检单任务号*/
 
 	public static final String COL_CHILD_ID = "CHILD_ID";
 	public static final String COL_PROD_TASK_NO = "PROD_TASK_NO";
 	public static final String COL_PROD_ORDER_NO = "PROD_ORDER_NO";
 	public static final String COL_COMPLETE_NUM = "COMPLETE_NUM";    		/* 已完成数量*/
-
+	public static final String COL_UN_COMPLETE_NUM = "UN_COMPLETE_NUM";    		/* 剩余数量*/
 	public static final String COL_ZL_PROD_TASK_NO = "ZL_PROD_TASK_NO";    		/* 质检单任务号*/
 
 	public static final String QUERY = "HPSC005B.query";
@@ -47,8 +47,9 @@ public class HPSC005B extends HPSC005 {
 	private String prodTaskNo = " ";
 	private String prodOrderNo = " ";
 	private BigDecimal completeNum = new BigDecimal(0.000);		/* 已完成数量*/
-
+	private BigDecimal unCompleteNum = new BigDecimal(0.000);		/* 剩余数量*/
 	private String zlprodTaskNo = " ";
+	
 	/**
 	 * the constructor.
 	 */
@@ -81,7 +82,14 @@ public class HPSC005B extends HPSC005 {
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("已完成数量");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_UN_COMPLETE_NUM);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("剩余数量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_ZL_PROD_TASK_NO);
 		eiColumn.setDescName("质检单任务号");
 		eiMetadata.addMeta(eiColumn);
@@ -137,7 +145,15 @@ public class HPSC005B extends HPSC005 {
 	public void setCompleteNum(BigDecimal completeNum) {
 		this.completeNum = completeNum;
 	}
-
+	
+	public BigDecimal getUnCompleteNum() {
+		return unCompleteNum;
+	}
+	
+	public void setUnCompleteNum(BigDecimal unCompleteNum) {
+		this.unCompleteNum = unCompleteNum;
+	}
+	
 	public String getZlProdTaskNo() {
 		return zlprodTaskNo;
 	}
@@ -157,6 +173,7 @@ public class HPSC005B extends HPSC005 {
 		setProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_TASK_NO)), prodTaskNo));
 		setProdOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_ORDER_NO)), prodOrderNo));
 		setCompleteNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COMPLETE_NUM)), completeNum));
+		setUnCompleteNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_COMPLETE_NUM)), unCompleteNum));
 		setZlProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ZL_PROD_TASK_NO)), zlprodTaskNo));
 	}
 	
@@ -171,6 +188,7 @@ public class HPSC005B extends HPSC005 {
 		map.put(FIELD_PROD_TASK_NO, StringUtils.toString(prodTaskNo, eiMetadata.getMeta(FIELD_PROD_TASK_NO)));
 		map.put(FIELD_PROD_ORDER_NO, StringUtils.toString(prodOrderNo, eiMetadata.getMeta(FIELD_PROD_ORDER_NO)));
 		map.put(FIELD_COMPLETE_NUM, StringUtils.toString(completeNum, eiMetadata.getMeta(FIELD_COMPLETE_NUM)));
+		map.put(FIELD_UN_COMPLETE_NUM, StringUtils.toString(unCompleteNum, eiMetadata.getMeta(FIELD_UN_COMPLETE_NUM)));
 		map.put(FIELD_ZL_PROD_TASK_NO, StringUtils.toString(zlprodTaskNo, eiMetadata.getMeta(FIELD_ZL_PROD_TASK_NO)));
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005B.java

 package com.baosight.hpjx.hp.sc.service;
 
+import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.hp.sc.domain.HPSC005B;
+import com.baosight.hpjx.util.CommonMethod;
 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.util.Arrays;
+
 /**
  * 生产任务
  *
@@ -22,6 +26,8 @@ public class ServiceHPSC005B extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC005B().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005D.java

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.hp.sc.domain.HPSC005A;
+import com.baosight.hpjx.hp.sc.domain.HPSC005B;
+import com.baosight.hpjx.hp.sc.tools.HPSCTools;
+import com.baosight.hpjx.util.EiInfoUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.MapUtils;
+import com.baosight.iplat4j.core.ei.EiBlock;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+import java.util.Map;
+
+/**
+ * @author:songx
+ * @date:2024/2/6,10:39
+ */
+public class ServiceHPSC005D extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+			String prodTaskNo = MapUtils.getString(queryMap, "prodTaskNo");
+			HPSC005B dbSc005b = HPSCTools.HpSc005b.get(prodTaskNo);
+			EiBlock resultBlock = inInfo.addBlock(EiConstant.resultBlock);
+			resultBlock.addRow(dbSc005b);
+			resultBlock.addBlockMeta(new HPSC005B().eiMetadata);
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+}
+
+

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

@@ -28,7 +28,8 @@
         B.PROD_ORDER_NO as "prodOrderNo",
         B.NUM as "num",
         B.TOTAL_WT as "totalWt",
-        B.COMPLETE_NUM as "completeNum",
+        B.COMPLETE_NUM as "completeNum",  <!-- 完成数量 -->
+        (B.NUM - B.COMPLETE_NUM) as "unCompleteNum",  <!-- 剩余数量 -->
         B.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
         B.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
         B.ORG_NO as "orgNo",
@@ -68,14 +69,17 @@
             B.ID = #childId#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="prodTaskNo">
-            B.PROD_TASK_NO = #prodTaskNo#
+            B.PROD_TASK_NO LIKE CONCAT('%', #prodTaskNo#, '%')
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="prodOrderNo">
-            B.PROD_ORDER_NO = #prodOrderNo#
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            B.FACTORY_CODE = #factoryCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="factoryName">
             B.FACTORY_NAME LIKE CONCAT('%', #factoryName#, '%')
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="orgNo">
+            B.ORG_NO = #orgNo#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="orgName">
             B.ORG_NAME LIKE CONCAT('%', #orgName#, '%')
         </isNotEmpty>

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -578,6 +578,21 @@ public class HPSCTools {
 		/**
 		 * 查询信息
 		 *
+		 * @param prodTaskNo
+		 * @return
+		 */
+		public static HPSC005A get(String prodTaskNo) {
+			AssertUtils.isEmpty(prodTaskNo, "生产任务号不能为空");
+			Map queryMap = new HashMap();
+			queryMap.put("prodTaskNo", prodTaskNo);
+			List<HPSC005A> results = DaoBase.getInstance().query(HPSC005A.QUERY, queryMap);
+			AssertUtils.isEmpty(results, String.format("生产任务[%s]信息不存在", prodTaskNo));
+			return results.get(0);
+		}
+		
+		/**
+		 * 查询信息
+		 *
 		 * @param prodTaskNos
 		 * @return
 		 */
@@ -615,6 +630,21 @@ public class HPSCTools {
 	public static class HpSc005b {
 		
 		/**
+		 * 查询信息
+		 *
+		 * @param prodTaskNo
+		 * @return
+		 */
+		public static HPSC005B get(String prodTaskNo) {
+			AssertUtils.isEmpty(prodTaskNo, "生产任务号不能为空");
+			Map queryMap = new HashMap();
+			queryMap.put("prodTaskNo", prodTaskNo);
+			List<HPSC005B> results = DaoBase.getInstance().query(HPSC005B.QUERY, queryMap);
+			AssertUtils.isEmpty(results, String.format("生产任务[%s]信息不存在", prodTaskNo));
+			return results.get(0);
+		}
+		
+		/**
 		 * 查询盘点单信息
 		 *
 		 * @param prodTaskNos

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

@@ -3,8 +3,8 @@ $(function () {
     IPLATUI.EFGrid = {
         "result" : {
             pageable: {
-                pageSize: 20,
-                pageSizes: [10, 20, 50, 70, 100],
+                pageSize: 15,
+                pageSizes: [15, 50, 70, 100],
             },
             columns: [{
 	            field: "operator",
@@ -15,14 +15,21 @@ $(function () {
 		            let template = '';
 		            if (filePath1) {
 			            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-				            + 'onclick="showUploadFile(' + filePath1 + ')"  >附件</a>&nbsp;';
+				            + 'onclick="showUploadFile(' + filePath1 + ')"  >附件</a>';
 		            }
 					if (zlprodTaskNo) {
 						template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-							+ 'onclick="showZlDetail(\'' + prodTaskNo + '\')"  >质检单</a>&nbsp;';
+							+ 'onclick="showZlDetail(\'' + prodTaskNo + '\')"  >质检单</a>';
 					}
 		            return template
 	            }
+            }, {
+	            field: "prodTaskNo",
+	            template: function (item) {
+		            let prodTaskNo = item.prodTaskNo;
+		            return '<a style="cursor: pointer;display: inline-flex" '
+			            + ' onclick="tearDetails(\'' + prodTaskNo + '\')"  >' + prodTaskNo + '</a>';
+	            }
             }]
         }
     }
@@ -62,6 +69,20 @@ function showUploadFile(id) {
 	});
 }
 
+/**
+ * 生产任务详情
+ *
+ * @param prodOrderNo
+ */
+function tearDetails(prodTaskNo) {
+	JSColorbox.open({
+		href: "HPSC005D?methodName=initLoad&inqu_status-0-prodTaskNo=" + prodTaskNo,
+		title: "<div style='text-align: center;'>生产任务详情</div>",
+		width: "80%",
+		height: "90%"
+	});
+}
+
 function showZlDetail(prodTaskNo) {
 	window.open("HPZL001?methodName=initLoad&inqu_status-0-prodTaskNo=" + prodTaskNo)
-}
+}
\ No newline at end of file

src/main/webapp/HP/SC/HPSC005B.jsp

@@ -7,16 +7,22 @@
 
 <EF:EFPage title="生产任务">
 	<EF:EFRegion id="inqu" title="查询条件">
+		<EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		<div class="row">
-			<EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>
 		<div class="row">
-			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="生产组名称" ename="orgName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFSelect cname="厂区名称" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="生产组名称" ename="orgNo" blockId="inqu_status" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -24,7 +30,7 @@
 		<EF:EFGrid blockId="result" autoDraw="override">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="childId" cname="主键" hidden="true"/>
-			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="110" align="center"/>
 			<EF:EFColumn ename="prodTaskNo" cname="生产任务号" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
@@ -32,13 +38,14 @@
 			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="100" align="center"/>
 			<%--<EF:EFColumn ename="remark1" cname="零件备注"/>--%>
 			<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="completeNum" cname="已完成数量" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="num" cname="任务数量" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="completeNum" cname="完成数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="unCompleteNum" cname="剩余数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="num" cname="数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="重量" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center" hidden="true"/>
+			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center" hidden="true"/>
 			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
 		</EF:EFGrid>

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

+let factoryGroupGlobalData = [];
+$(function () {
+
+    IPLATUI.EFGrid = {
+        "result" : {
+	        pageable: {
+		        pageSize: 20,
+		        pageSizes: [10, 20, 50, 70, 100],
+	        },
+	        columns: [{
+		        field: "orgName",
+		        attributes: {
+			        class: "i-input-readonly"
+		        }
+	        }, {
+		        field: "orgNo",
+		        template: function (dataItem) {
+			        for (let i = 0; i < factoryGroupGlobalData.length; i++) {
+				        if (factoryGroupGlobalData[i]['valueField'] === dataItem['orgNo']) {
+					        return factoryGroupGlobalData[i]['textField'];
+				        }
+			        }
+			        return "";
+		        },
+		        editor: function (container, options) {
+			        let inInfo = new EiInfo();
+			        inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
+			        // 1:生产组
+			        inInfo.set("inqu_status-0-groupType", 1);
+			        inInfo.set("serviceName", "HPPZ011");
+			        inInfo.set("methodName", "queryGroupComboBox");
+			        inInfo.set("blockId", "group_record_block_id");
+			        inInfo.set("field", options.field);
+			        refreshSelect(container, inInfo);
+		        }
+	        }],
+	        onSave: function (e) {
+		        // 阻止后台保存请求，使用自定义保存
+		        e.preventDefault();
+		        save();
+	        },
+	        onDelete: function (e) {
+		        // 阻止后台删除请求，使用自定义删除
+		        e.preventDefault();
+		        deleteFunc();
+	        }
+        }
+    }
+
+
+});
+
+
+
+

src/main/webapp/HP/SC/HPSC005D.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="生产任务详情">
+	<EF:EFRegion id="inqu" title="任务详情">
+		<div class="row">
+			<EF:EFInput cname="生产任务号" blockId="result" ename="prodTaskNo" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="生产订单号" blockId="result" ename="prodOrderNo" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="项目号" blockId="result" ename="projCode" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="项目名称" blockId="result" ename="projName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="部件名称" blockId="result" ename="prdtName" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="零件名称" blockId="result" ename="partName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件规格" blockId="result" ename="partSpec" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="重量" blockId="result" ename="totalWt" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="零件长" blockId="result" ename="partLength" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件宽" blockId="result" ename="partWidth" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件厚" blockId="result" ename="partThick" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="完成数量" blockId="result" ename="completeNum" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="剩余数量" blockId="result" ename="unCompleteNum" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="数量" blockId="result" ename="num" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate"  row="0" colWidth="4"
+			                 format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFInput cname="厂区名称" blockId="result" ename="factoryName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="生产组名称" blockId="result" ename="orgName" row="0" colWidth="4" readonly="true"/>
+		</div>
+	</EF:EFRegion>
+</EF:EFPage>