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

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC008.java

 package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.sc.domain.HGSC002;
 import com.baosight.hggp.hg.sc.domain.HGSC008;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.sc.util.HgScUtils;
-import com.baosight.hggp.util.EiInfoUtils;
-import com.baosight.hggp.util.LogUtils;
-import com.baosight.hggp.util.ObjectUtils;
+import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -21,7 +20,7 @@ import java.util.Map;
  * @version 1.0 2024/5/24
  */
 public class ServiceHGSC008 extends ServiceEPBase {
-	
+
 	/**
 	 * 初始化
 	 *
@@ -37,7 +36,7 @@ public class ServiceHGSC008 extends ServiceEPBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 查询
 	 *
@@ -56,7 +55,7 @@ public class ServiceHGSC008 extends ServiceEPBase {
 		}
 		return inInfo;
 	}
-	
+
 	@Override
 	@OperationLogAnnotation(operModul = "生产报工单", operType = "删除", operDesc = "删除")
 	public EiInfo delete(EiInfo inInfo) {
@@ -73,6 +72,32 @@ public class ServiceHGSC008 extends ServiceEPBase {
 		}
 		return inInfo;
 	}
+
+	/**
+	 * 保存操作.
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "生产报工单", operType = "修改", operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 写入数据
+			for (Map resultRow : resultRows) {
+				HGSC008 hgsc008 = new HGSC008();
+				hgsc008.fromMap(resultRow);
+				AssertUtils.isNull(hgsc008.getId(), "报工单id不能为空");
+				DaoUtils.update(hgsc008.UPDATE, hgsc008);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return inInfo;
+	}
 }
 
 

src/main/java/com/baosight/hggp/hg/zl/domain/HGZL002.java

@@ -67,6 +67,7 @@ public class HGZL002 extends DaoEPBase {
 	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_register_date = "registerDate";    		/* 报工日期*/
 
 	public static final String COL_id = "id";
 	public static final String COL_mat_id = "mat_id";    		/* 物料清单ID*/
@@ -165,6 +166,7 @@ public class HGZL002 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
+	private String registerDate = " ";		/* 报工日期*/
 
 	/**
 	 * initialize the metadata.
@@ -364,7 +366,9 @@ public class HGZL002 extends DaoEPBase {
 		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_register_date);
+		eiColumn.setDescName("报工日期");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -1078,6 +1082,15 @@ public class HGZL002 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+
+	public String getRegisterDate() {
+		return registerDate;
+	}
+
+	public void setRegisterDate(String registerDate) {
+		this.registerDate = registerDate;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1130,6 +1143,7 @@ public class HGZL002 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));
+		setRegisterDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_register_date)), registerDate));
 	}
 
 	/**
@@ -1183,6 +1197,7 @@ public class HGZL002 extends DaoEPBase {
 		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_register_date, StringUtils.toString(registerDate, eiMetadata.getMeta(FIELD_register_date)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/zl/sql/HGZL002.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-29 14:33:20
-   		Version :  1.0
-		schema : hggp
-		tableName : HGZL002
-		 id  BIGINT   NOT NULL   primarykey,
-		 mat_id  BIGINT   NOT NULL,
-		 work_id  BIGINT   NOT NULL,
-		 tech_flow_id  BIGINT,
-		 tech_flow_name  BIGINT,
-		 invent_process_id  BIGINT,
-		 process_code  VARCHAR,
-		 process_name  VARCHAR,
-		 process_order  BIGINT,
-		 company_code  VARCHAR   NOT NULL,
-		 company_name  VARCHAR   NOT NULL,
-		 dep_code  VARCHAR,
-		 dep_name  VARCHAR,
-		 proj_code  VARCHAR,
-		 proj_name  VARCHAR,
-		 work_code  VARCHAR,
-		 check_code  VARCHAR,
-		 product_type  TINYINT,
-		 product_code  VARCHAR,
-		 product_name  VARCHAR,
-		 plan_start_date  VARCHAR,
-		 plan_end_date  VARCHAR,
-		 factory_code  VARCHAR,
-		 factory_name  VARCHAR,
-		 group_code  VARCHAR,
-		 group_name  VARCHAR,
-		 work_by  VARCHAR,
-		 work_name  VARCHAR,
-		 quantity  TINYINT,
-		 pass_quantity  TINYINT,
-		 unpass_quantity  TINYINT,
-		 single_weight  DECIMAL,
-		 total_weight  DECIMAL,
-		 check_by  VARCHAR,
-		 check_name  VARCHAR,
-		 check_date  VARCHAR,
-		 check_status  TINYINT,
-		 account_code  VARCHAR   NOT NULL,
-		 created_by  VARCHAR,
-		 created_name  VARCHAR,
-		 created_time  VARCHAR,
-		 updated_by  VARCHAR,
-		 updated_name  VARCHAR,
-		 updated_time  VARCHAR
-	-->
+<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 <sqlMap namespace="HGZL002">
 
 	<sql id="condition">
@@ -198,6 +149,9 @@
 		<isNotEmpty prepend=" AND " property="ids">
 			id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="registerDate">
+			register_date = #registerDate#
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"
@@ -246,7 +200,8 @@
 		created_time	as "createdTime",  <!-- 创建时间 -->
 		updated_by	as "updatedBy",  <!-- 更新人 -->
 		updated_name	as "updatedName",  <!-- 修改人名称 -->
-		updated_time	as "updatedTime" <!-- 更新时间 -->
+		updated_time	as "updatedTime", <!-- 更新时间 -->
+		register_date	as "registerDate" <!-- 报工日期 -->
 		FROM ${hggpSchema}.HGZL002 WHERE 1=1
 		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -265,141 +220,6 @@
 		<include refid="condition" />
 	</select>
 
-	<!--
-		<isNotEmpty prepend=" AND " property="id">
-			id = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="matId">
-			mat_id = #matId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="workId">
-			work_id = #workId#
-		</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="processCode">
-			process_code = #processCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="processName">
-			process_name = #processName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="processOrder">
-			process_order = #processOrder#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="companyCode">
-			company_code = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="companyName">
-			company_name = #companyName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depCode">
-			dep_code = #depCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depName">
-			dep_name = #depName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			proj_code = #projCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="workCode">
-			work_code = #workCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="checkCode">
-			check_code = #checkCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="productType">
-			product_type = #productType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="productCode">
-			product_code = #productCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="productName">
-			product_name = #productName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="planStartDate">
-			plan_start_date = #planStartDate#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="planEndDate">
-			plan_end_date = #planEndDate#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="factoryCode">
-			factory_code = #factoryCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="factoryName">
-			factory_name = #factoryName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="groupCode">
-			group_code = #groupCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="groupName">
-			group_name = #groupName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="workBy">
-			work_by = #workBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="workName">
-			work_name = #workName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="quantity">
-			quantity = #quantity#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="passQuantity">
-			pass_quantity = #passQuantity#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="unpassQuantity">
-			unpass_quantity = #unpassQuantity#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="singleWeight">
-			single_weight = #singleWeight#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="totalWeight">
-			total_weight = #totalWeight#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="checkBy">
-			check_by = #checkBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="checkName">
-			check_name = #checkName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="checkDate">
-			check_date = #checkDate#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="checkStatus">
-			check_status = #checkStatus#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="accountCode">
-			account_code = #accountCode#
-		</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>
-	-->
-
 	<insert id="insert">
 		INSERT INTO ${hggpSchema}.HGZL002 (id,
 		mat_id,  <!-- 物料清单ID -->
@@ -444,9 +264,10 @@
 		created_time,  <!-- 创建时间 -->
 		updated_by,  <!-- 更新人 -->
 		updated_name,  <!-- 修改人名称 -->
-		updated_time  <!-- 更新时间 -->
+		updated_time,  <!-- 更新时间 -->
+		register_Date  <!-- 报工日期 -->
 		)
-		VALUES (#id#, #matId#, #workId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #workCode#, #checkCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #quantity#, #passQuantity#, #unpassQuantity#, #singleWeight#, #totalWeight#, #checkBy#, #checkName#, #checkDate#, #checkStatus#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
+		VALUES (#id#, #matId#, #workId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #workCode#, #checkCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #quantity#, #passQuantity#, #unpassQuantity#, #singleWeight#, #totalWeight#, #checkBy#, #checkName#, #checkDate#, #checkStatus#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #registerDate#)
 		<selectKey resultClass="long" keyProperty="id">
 			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC002
 		</selectKey>
@@ -508,7 +329,8 @@
 		&#45;&#45; created_time	= #createdTime#,   &lt;!&ndash; 创建时间 &ndash;&gt;-->
 		updated_by	= #updatedBy#,   <!-- 更新人 -->
 		updated_name	= #updatedName#,   <!-- 修改人名称 -->
-		updated_time	= #updatedTime#  <!-- 更新时间 -->
+		updated_time	= #updatedTime#,  <!-- 更新时间 -->
+		register_Date	= #registerDate#  <!-- 报工日期 -->
 		WHERE
 		id = #id#
 	</update>

src/main/webapp/HG/SC/HGSC007A.jsp

@@ -34,6 +34,10 @@
                              format="yyyy-MM-dd" required="true" readonly="false"/>
             <EF:EFInput ename="result-0-quantity" cname="报工数量" format="{0:0.0}" colWidth="4" required="true"/>
             <EF:EFInput ename="result-0-totalWeight" cname="报工重量" format="{0:0.00}" editType="text" colWidth="4"  readonly="true"/>
+            <EF:EFDatePicker cname="计划完工日期" ename="result-0-planEndDate"  colWidth="4"
+                             format="yyyy-MM-dd" required="true" readonly="false"/>
+        </div>
+        <div class="row">
             <EF:EFInput ename="result-0-exceedReason" cname="超报原因" type="textarea" editType="text" colWidth="8" ratio="2:10"/>
         </div>
     </EF:EFRegion>

src/main/webapp/HG/SC/HGSC008.js

@@ -35,6 +35,11 @@ $(function () {
             if(e.eiInfo.extAttr.methodName == 'save'||e.eiInfo.extAttr.methodName == 'delete' ){
                 query();
             }
+        },
+        onSave: function (e) {
+            // 阻止后台保存请求，使用自定义保存
+            e.preventDefault();
+            save();
         }
     }
 });
@@ -51,6 +56,23 @@ $(window).load(function () {
     query();
 });
 
+
+/**
+ * 保存
+ */
+let save = function () {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+        ok: function () {
+            JSUtils.submitGridsData("result", "HGSC008", "save", true);
+        }
+    });
+}
+
 /**
  * 显示附件清单
  *
@@ -63,4 +85,4 @@ function showUploadFile(id) {
         width: "85%",
         height: "80%",
     });
-}
+}
\ No newline at end of file

src/main/webapp/HG/SC/HGSC008.jsp

@@ -23,9 +23,13 @@
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="accountCode" cname="账套" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
-            <EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="180" align="center" readOnly="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="180" align="center" readOnly="true"/>
+            <EF:EFColumn ename="projName" cname="项目名称" enable="false" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="workCode" cname="报工单号" width="130" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="registerDate" cname="报工日期" width="120" enable="true" readonly="false" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
+            <EF:EFColumn ename="planEndDate" cname="计划完工日期" width="120" enable="false" readonly="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" />
             <EF:EFColumn ename="productCode" cname="产品编码" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="productName" cname="产品名称" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>

src/main/webapp/HG/ZL/HGZL002.jsp

@@ -37,6 +37,8 @@
 			<EF:EFColumn ename="productCode" cname="存货编码" width="90" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="productName" cname="存货名称" width="90" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="quantity" cname="报工数量" width="90" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="registerDate" cname="报工日期" width="120" enable="true" align="center" editType="date"
+						 dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
 			<EF:EFColumn ename="passQuantity" cname="合格数量" format="{0:0.0}" width="90" align="center" required="true"/>
 			<EF:EFColumn ename="unpassQuantity" cname="不合格数量" format="{0:0.0}" width="100" align="center"
 			             required="true"/>