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

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

@@ -40,6 +40,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String FIELD_TOTAL_WT = "totalWt";    		/* 计划重量*/
     public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate";    		/* 实际完工日期*/
     public static final String FIELD_ACTUAL_COMPLETION_NUM = "actualCompletionNum";    		/* 实际完工数量*/
+    public static final String FIELD_ACTUAL_COMPLETION_UNIT_WT = "actualCompletionUnitWt";    		/* 实际完工重量*/
     public static final String FIELD_STATUS = "status";    		/* 状态   0-计划中，1-生产中，2-已完成*/
     public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
     public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
@@ -53,6 +54,8 @@ public class HPSC006 extends DaoEPBase {
     public static final String FIELD_REMARK = "remark";    		/* 备注*/
     public static final String FIELD_FILE_PATH1 = "filePath1";    		/* 文件地址1*/
     public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
+    public static final String FIELD_MATERIAL = "material";    		/* 材质*/
+
 
     public static final String COL_ID = "ID";
     public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -72,6 +75,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String COL_TOTAL_WT = "TOTAL_WT";    		/* 计划重量*/
     public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE";    		/* 实际完工日期*/
     public static final String COL_ACTUAL_COMPLETION_NUM = "ACTUAL_COMPLETION_NUM";    		/* 实际完工数量*/
+    public static final String COL_ACTUAL_COMPLETION_UNIT_WT = "ACTUAL_COMPLETION_UNIT_WT";    		/* 实际完工重量*/
     public static final String COL_STATUS = "STATUS";    		/* 状态   0-计划中，1-生产中，2-已完成*/
     public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
     public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
@@ -85,12 +89,14 @@ public class HPSC006 extends DaoEPBase {
     public static final String COL_REMARK = "REMARK";    		/* 备注*/
     public static final String COL_FILE_PATH1 = "FILE_PATH1";    		/* 文件地址1*/
     public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
+    public static final String COL_MATERIAL = "MATERIAL";    		/* 材质*/
+
 
-    public static final String QUERY = "t_hpsc006.query";
-    public static final String COUNT = "t_hpsc006.count";
-    public static final String INSERT = "t_hpsc006.insert";
-    public static final String UPDATE = "t_hpsc006.update";
-    public static final String DELETE = "t_hpsc006.delete";
+    public static final String QUERY = "HPSC006.query";
+    public static final String COUNT = "HPSC006.count";
+    public static final String INSERT = "HPSC006.insert";
+    public static final String UPDATE = "HPSC006.update";
+    public static final String DELETE = "HPSC006.delete";
 
     private Long id = new Long(0);
     private String companyCode = " ";		/* 企业编码 预留*/
@@ -110,6 +116,7 @@ public class HPSC006 extends DaoEPBase {
     private BigDecimal totalWt = new BigDecimal(0.000);		/* 计划重量*/
     private String actualCompletionDate = " ";		/* 实际完工日期*/
     private BigDecimal actualCompletionNum = new BigDecimal("0");		/* 实际完工数量*/
+    private BigDecimal actualCompletionUnitWt = new BigDecimal(0.000);		/* 实际完工重量*/
     private Integer status = new Integer(0);		/* 状态   0-计划中，1-生产中，2-已完成*/
     private String orgNo = " ";		/* 生产组编码*/
     private String orgName = " ";		/* 生产组名称*/
@@ -123,6 +130,7 @@ public class HPSC006 extends DaoEPBase {
     private String remark = " ";		/* 备注*/
     private String filePath1 = " ";		/* 文件地址1*/
     private Integer inventRecordId = new Integer(0);		/* 存货档案ID*/
+    private String material = " ";		/* 材质*/
 
     /**
      * initialize the metadata.
@@ -276,6 +284,10 @@ public class HPSC006 extends DaoEPBase {
         eiColumn.setDescName("存货档案ID");
         eiMetadata.addMeta(eiColumn);
 
+        eiColumn = new EiColumn(FIELD_MATERIAL);
+        eiColumn.setDescName("材质");
+        eiMetadata.addMeta(eiColumn);
+
 
     }
 
@@ -575,6 +587,22 @@ public class HPSC006 extends DaoEPBase {
         this.actualCompletionNum = actualCompletionNum;
     }
     /**
+     * get the actualCompletionUnitWt - 实际完工重量.
+     * @return the actualCompletionUnitWt
+     */
+    public BigDecimal getActualCompletionUnitWt() {
+        return this.actualCompletionUnitWt;
+    }
+
+    /**
+     * set the actualCompletionUnitWt - 实际完工重量.
+     *
+     * @param actualCompletionUnitWt - 实际完工重量
+     */
+    public void setActualCompletionUnitWt(BigDecimal actualCompletionUnitWt) {
+        this.actualCompletionUnitWt = actualCompletionUnitWt;
+    }
+    /**
      * get the status - 状态   0-计划中，1-生产中，2-已完成.
      * @return the status
      */
@@ -783,6 +811,22 @@ public class HPSC006 extends DaoEPBase {
         this.inventRecordId = inventRecordId;
     }
     /**
+     * get the material - 材质.
+     * @return the material
+     */
+    public String getMaterial() {
+        return this.material;
+    }
+
+    /**
+     * set the material - 材质.
+     *
+     * @param material - 材质
+     */
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+    /**
      * get the value from Map.
      *
      * @param map - source data map
@@ -808,6 +852,7 @@ public class HPSC006 extends DaoEPBase {
         setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_WT)), totalWt));
         setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
         setActualCompletionNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_NUM)), actualCompletionNum));
+        setActualCompletionUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_UNIT_WT)), actualCompletionUnitWt));
         setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
         setOrgNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NO)), orgNo));
         setOrgName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NAME)), orgName));
@@ -821,6 +866,7 @@ public class HPSC006 extends DaoEPBase {
         setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
         setFilePath1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH1)), filePath1));
         setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
+        setMaterial(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MATERIAL)), material));
     }
 
     /**
@@ -848,6 +894,7 @@ public class HPSC006 extends DaoEPBase {
         map.put(FIELD_TOTAL_WT, StringUtils.toString(totalWt, eiMetadata.getMeta(FIELD_TOTAL_WT)));
         map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE)));
         map.put(FIELD_ACTUAL_COMPLETION_NUM, StringUtils.toString(actualCompletionNum, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_NUM)));
+        map.put(FIELD_ACTUAL_COMPLETION_UNIT_WT, StringUtils.toString(actualCompletionUnitWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_UNIT_WT)));
         map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
         map.put(FIELD_ORG_NO, StringUtils.toString(orgNo, eiMetadata.getMeta(FIELD_ORG_NO)));
         map.put(FIELD_ORG_NAME, StringUtils.toString(orgName, eiMetadata.getMeta(FIELD_ORG_NAME)));
@@ -861,6 +908,7 @@ public class HPSC006 extends DaoEPBase {
         map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
         map.put(FIELD_FILE_PATH1, StringUtils.toString(filePath1, eiMetadata.getMeta(FIELD_FILE_PATH1)));
         map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
+        map.put(FIELD_MATERIAL, StringUtils.toString(material, eiMetadata.getMeta(FIELD_MATERIAL)));
 
         return map;
     }

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

@@ -229,6 +229,7 @@ public class ServiceHPSC006 extends ServiceBase {
                 HPSC006.setId(NumberUtils.toLong(id[i]));
                 HPSC006.setStatus(1);
                 HPSC006.setOrgNo(HPPZ011.getGroupCode());
+                HPSC006.setOrgName(HPPZ011.getGroupName());
                 HPSC006.setFactoryCode(HPPZ011.getFactoryCode());
                 HPSC006.setFactoryName(HPPZ011.getFactoryName());
                 DaoUtils.update("HPSC006.updateAssign", HPSC006.toMap());

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

@@ -50,12 +50,14 @@
 		INVENT_WIDTH	as "inventWidth",  <!-- 物料-宽 -->
 		INVENT_THICK	as "inventThick",  <!-- 物料-厚 -->
 		INVENT_SPEC	as "inventSpec",  <!-- 物料规格 -->
+		MATERIAL as "material",
 		PLAN_COMPLETION_DATE	as "planCompletionDate",  <!-- 计划完成日期 -->
 		NUM	as "num",  <!-- 计划数量 -->
 		UNIT_WT	as "unitWt",  <!-- 计划单重 -->
 		TOTAL_WT	as "totalWt",  <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE	as "actualCompletionDate",  <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM	as "actualCompletionNum",  <!-- 实际完工数量 -->
+		ACTUAL_COMPLETION_UNIT_WT	as "actualCompletionUnitWt",
 		STATUS	as "status",  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO	as "orgNo",  <!-- 生产组编码 -->
 		ORG_NAME	as "orgName",  <!-- 生产组名称 -->
@@ -108,6 +110,9 @@
 		<isNotEmpty prepend=" AND " property="inventSpec">
 			INVENT_SPEC = #inventSpec#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="material">
+			MATERIAL = #material#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planCompletionDate">
 			PLAN_COMPLETION_DATE = #planCompletionDate#
 		</isNotEmpty>
@@ -214,12 +219,14 @@
 		INVENT_WIDTH,  <!-- 物料-宽 -->
 		INVENT_THICK,  <!-- 物料-厚 -->
 		INVENT_SPEC,  <!-- 物料规格 -->
+		MATERIAL,
 		PLAN_COMPLETION_DATE,  <!-- 计划完成日期 -->
 		NUM,  <!-- 计划数量 -->
 		UNIT_WT,  <!-- 计划单重 -->
 		TOTAL_WT,  <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE,  <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM,  <!-- 实际完工数量 -->
+		ACTUAL_COMPLETION_UNIT_WT,
 		STATUS,  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO,  <!-- 生产组编码 -->
 		ORG_NAME,  <!-- 生产组名称 -->
@@ -234,7 +241,11 @@
 		FILE_PATH1,  <!-- 文件地址1 -->
 		INVENT_RECORD_ID  <!-- 存货档案ID -->
 		)
-		VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#, #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #planCompletionDate#, #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #status#, #orgNo#, #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #inventRecordId#)
+		VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#,
+		        #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#,
+		        #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#,#status#, #orgNo#,
+		        #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#,
+		        #depCode#, #remark#, #filePath1#, #inventRecordId#)
 	</insert>
 
 	<delete id="delete">
@@ -256,12 +267,14 @@
 		INVENT_WIDTH	= #inventWidth#,   <!-- 物料-宽 -->
 		INVENT_THICK	= #inventThick#,   <!-- 物料-厚 -->
 		INVENT_SPEC	= #inventSpec#,   <!-- 物料规格 -->
+		MATERIAL = #material#,
 		PLAN_COMPLETION_DATE	= #planCompletionDate#,   <!-- 计划完成日期 -->
 		NUM	= #num#,   <!-- 计划数量 -->
 		UNIT_WT	= #unitWt#,   <!-- 计划单重 -->
 		TOTAL_WT	= #totalWt#,   <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
+		ACTUAL_COMPLETION_UNIT_WT	= #actualCompletionUnitWt#,
 		STATUS	= #status#,   <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,   <!-- 生产组名称 -->

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC007.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-02-06 15:50:11
+   		Version :  1.0
+		schema : hpjx
+		tableName : T_HPSC007
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 COMPANY_CODE  VARCHAR, 
+		 PROJ_CODE  VARCHAR, 
+		 PROJ_NAME  VARCHAR, 
+		 HPSC006_ID  VARCHAR, 
+		 ACTUAL_COMPLETION_DATE  VARCHAR, 
+		 ACTUAL_COMPLETION_NUM  DECIMAL, 
+		 ACTUAL_COMPLETION_UNIT_WT  DECIMAL, 
+		 USER_ID  VARCHAR, 
+		 USER_NAME  VARCHAR, 
+		 CREATED_BY  VARCHAR, 
+		 CREATED_TIME  VARCHAR, 
+		 UPDATED_BY  VARCHAR, 
+		 UPDATED_TIME  VARCHAR, 
+		 DEP_CODE  VARCHAR, 
+		 REMARK  VARCHAR
+	-->
+<sqlMap namespace="HPSC007">
+
+	<sql id="condition">
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE = #projCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			PROJ_NAME = #projName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="hpsc006Id">
+			HPSC006_ID = #hpsc006Id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionDate">
+			ACTUAL_COMPLETION_DATE = #actualCompletionDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionNum">
+			ACTUAL_COMPLETION_NUM = #actualCompletionNum#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionUnitWt">
+			ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userId">
+			USER_ID = #userId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userName">
+			USER_NAME = #userName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="remark">
+			REMARK = #remark#
+		</isNotEmpty>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC007">
+		SELECT
+				ID	as "id",  
+				COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
+				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
+				PROJ_NAME	as "projName",  <!-- 项目名称 -->
+				HPSC006_ID	as "hpsc006Id",  <!-- 生产下料ID -->
+				ACTUAL_COMPLETION_DATE	as "actualCompletionDate",  <!-- 实际完工日期 -->
+				ACTUAL_COMPLETION_NUM	as "actualCompletionNum",  <!-- 实际完工数量 -->
+				ACTUAL_COMPLETION_UNIT_WT	as "actualCompletionUnitWt",  <!-- 实际完工重量 -->
+				USER_ID	as "userId",  <!-- 完成人ID -->
+				USER_NAME	as "userName",  <!-- 完成人姓名 -->
+				CREATED_BY	as "createdBy",  <!-- 创建人 -->
+				CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+				UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
+				UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
+				DEP_CODE	as "depCode",  <!-- 部门编码 -->
+				REMARK	as "remark" <!-- 备注 -->
+		FROM ${hpjxSchema}.T_HPSC007 WHERE 1=1
+        <include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+    		  $orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+    		  ID asc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC007 WHERE 1=1
+    <include refid="condition" />
+	</select>
+
+	<!--
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE = #projCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			PROJ_NAME = #projName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="hpsc006Id">
+			HPSC006_ID = #hpsc006Id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionDate">
+			ACTUAL_COMPLETION_DATE = #actualCompletionDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionNum">
+			ACTUAL_COMPLETION_NUM = #actualCompletionNum#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="actualCompletionUnitWt">
+			ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userId">
+			USER_ID = #userId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userName">
+			USER_NAME = #userName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="remark">
+			REMARK = #remark#
+		</isNotEmpty>
+	-->
+
+	<insert id="insert">
+		INSERT INTO ${hpjxSchema}.T_HPSC007 (ID,
+										COMPANY_CODE,  <!-- 企业编码 预留 -->
+										PROJ_CODE,  <!-- 项目编码 -->
+										PROJ_NAME,  <!-- 项目名称 -->
+										HPSC006_ID,  <!-- 生产下料ID -->
+										ACTUAL_COMPLETION_DATE,  <!-- 实际完工日期 -->
+										ACTUAL_COMPLETION_NUM,  <!-- 实际完工数量 -->
+										ACTUAL_COMPLETION_UNIT_WT,  <!-- 实际完工重量 -->
+										USER_ID,  <!-- 完成人ID -->
+										USER_NAME,  <!-- 完成人姓名 -->
+										CREATED_BY,  <!-- 创建人 -->
+										CREATED_TIME,  <!-- 创建时间 -->
+										UPDATED_BY,  <!-- 更新人 -->
+										UPDATED_TIME,  <!-- 更新时间 -->
+										DEP_CODE,  <!-- 部门编码 -->
+										REMARK  <!-- 备注 -->
+										)
+	    VALUES (#id#, #companyCode#, #projCode#, #projName#, #hpsc006Id#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #userId#, #userName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
+	</insert>
+
+	<delete id="delete">
+		DELETE FROM ${hpjxSchema}.T_HPSC007 WHERE
+			ID = #id#
+	</delete>
+
+	<update id="update">
+		UPDATE ${hpjxSchema}.T_HPSC007
+		SET
+					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 预留 -->
+					PROJ_CODE	= #projCode#,   <!-- 项目编码 -->
+					PROJ_NAME	= #projName#,   <!-- 项目名称 -->
+					HPSC006_ID	= #hpsc006Id#,   <!-- 生产下料ID -->
+					ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
+					ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
+					ACTUAL_COMPLETION_UNIT_WT	= #actualCompletionUnitWt#,   <!-- 实际完工重量 -->
+					USER_ID	= #userId#,   <!-- 完成人ID -->
+					USER_NAME	= #userName#,   <!-- 完成人姓名 -->
+					CREATED_BY	= #createdBy#,   <!-- 创建人 -->
+					CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->
+					UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
+					UPDATED_TIME	= #updatedTime#,   <!-- 更新时间 -->
+					DEP_CODE	= #depCode#,   <!-- 部门编码 -->
+					REMARK	= #remark#  <!-- 备注 -->
+			WHERE
+			ID = #id#
+	</update>
+
+</sqlMap>

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

@@ -8,7 +8,7 @@ $(function () {
     $("#ASSIGN").on("click", function () {
         //重置全局变量
         ids = [];
-        let rows = resultGrid.getCheckedRows()
+        let rows = detailGrid.getCheckedRows()
         if (rows.length < 1) {
             message("请至少选择一条需要分派的数据");
             return;

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

@@ -29,33 +29,18 @@
     <EF:EFRegion id="result" title="生产任务集">
 
         <EF:EFGrid blockId="result" autoDraw="no">
-
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
             <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
             <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
-            <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" enable="false">
-                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
-            </EF:EFComboColumn>
-            <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
             <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
-            <EF:EFColumn enable="false" ename="remark" cname="部件备注"/>
-            <EF:EFComboColumn ename="partType" cname="零件类型" width="90" align="center" enable="false">
-                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
-            </EF:EFComboColumn>
-            <EF:EFColumn enable="false" ename="partCode" cname="零件编码"/>
             <EF:EFColumn enable="false" ename="partName" cname="零件名称"/>
-            <EF:EFColumn enable="false" ename="partSpec" cname="零件规格"/>
-            <EF:EFColumn enable="false" ename="remark1" cname="零件备注"/>
-
             <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>
-            <EF:EFColumn enable="false" ename="num" cname="计划数量"/>
-            <EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/>
             <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
         </EF:EFGrid>
     </EF:EFRegion>
 
-    <EF:EFRegion id="detail" title="物料清单">
+    <EF:EFRegion id="detail" title="下料清单">
         <EF:EFInput ename="projCode"  type="hidden"/>
         <EF:EFInput ename="projName"  type="hidden"/>
         <EF:EFInput ename="productionOrderNo"  type="hidden"/>
@@ -75,6 +60,7 @@
             <EF:EFColumn ename="inventLength"  cname="长" format="{0:N3}"/>
             <EF:EFColumn ename="inventWidth"  cname="宽" format="{0:N3}"/>
             <EF:EFColumn ename="inventThick"  cname="厚" format="{0:N3}"/>
+            <EF:EFColumn ename="material" cname="材质" />
             <EF:EFColumn ename="remark" cname="备注" />
             <EF:EFColumn ename="num" cname="计划数量"/>
             <EF:EFColumn ename="unitWt" format="{0:N3}" cname="计划单重"/>
@@ -83,6 +69,7 @@
             <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          enable="false"/>
             <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionUnitWt" cname="实际完工重量" readonly="true"/>
             <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态">
                 <EF:EFOption label="计划中" value="0"/>
                 <EF:EFOption label="生产中" value="1"/>