2024-10-08 委外入库单优化

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java

@@ -50,6 +50,7 @@ public class HGKC014A extends DaoEPBase {
 	public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight";    		/* 入库重量*/
 	public static final String FIELD_DELIVER_QTY = "deliverQty";    		/* 退货数量*/
 	public static final String FIELD_ACTUAL_QTY = "actualQty";    		/* 实际入库数量*/
+	public static final String FIELD_PCS_ID = "pcsId";    		/* 加工明细ID*/
 
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 账套*/
@@ -107,6 +108,7 @@ public class HGKC014A extends DaoEPBase {
 	private BigDecimal depositWeight = new BigDecimal("0");		/* 入库重量*/
 	private BigDecimal deliverQty = new BigDecimal("0");		/* 退货数量*/
 	private BigDecimal actualQty = new BigDecimal("0");		/* 实际入库数量*/
+	private Long pcsId = new Long(0);		/* 加工明细ID*/
 
 	/**
 	 * initialize the metadata.
@@ -241,6 +243,10 @@ public class HGKC014A extends DaoEPBase {
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("实际入库数量");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PCS_ID);
+		eiColumn.setDescName("加工明细ID");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -643,6 +649,14 @@ public class HGKC014A extends DaoEPBase {
 		this.actualQty = actualQty;
 	}
 
+	public Long getPcsId() {
+		return pcsId;
+	}
+
+	public void setPcsId(Long pcsId) {
+		this.pcsId = pcsId;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -679,6 +693,7 @@ public class HGKC014A extends DaoEPBase {
 		setDepositWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_WEIGHT)), depositWeight));
 		setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
 		setActualQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_QTY)), actualQty));
+		setPcsId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PCS_ID)), pcsId));
 	}
 
 	/**
@@ -716,6 +731,7 @@ public class HGKC014A extends DaoEPBase {
 		map.put(FIELD_DEPOSIT_WEIGHT, StringUtils.toString(depositWeight, eiMetadata.getMeta(FIELD_DEPOSIT_WEIGHT)));
 		map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
 		map.put(FIELD_ACTUAL_QTY, StringUtils.toString(actualQty, eiMetadata.getMeta(FIELD_ACTUAL_QTY)));
+		map.put(FIELD_PCS_ID, StringUtils.toString(pcsId, eiMetadata.getMeta(FIELD_PCS_ID)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC014B.java

@@ -117,7 +117,7 @@ public class ServiceHGKC014B extends ServiceEPBase {
 
 
     public void add(HGKC014A hgkc014a) {
-        hgkc014a.setId(null);
+        hgkc014a.setPcsId(hgkc014a.getId());
         hgkc014a.setUpdatedBy(null);
         hgkc014a.setUpdatedName(null);
         hgkc014a.setUpdatedTime(null);
@@ -125,6 +125,7 @@ public class ServiceHGKC014B extends ServiceEPBase {
         hgkc014a.setCreatedName(null);
         hgkc014a.setCreatedTime(null);
         hgkc014a.setDepCode(null);
+        hgkc014a.setId(null);
         DaoUtils.insert(HGKC014A.INSERT, hgkc014a);
     }
 

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014A.xml

@@ -110,6 +110,9 @@
 		<isNotEmpty prepend=" AND " property="contractCodes">
 			CONTRACT_CODE IN <iterate close=")" open="(" conjunction="," property="contractCodes">#contractCodes[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="pcsId">
+			PCS_ID = #pcsId#
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"
@@ -142,7 +145,8 @@
 				DEPOSIT_UNIT_WEIGHT	as "depositUnitWeight", <!-- 入库单重 -->
 				DEPOSIT_WEIGHT	as "depositWeight", <!-- 入库重量 -->
 				DELIVER_QTY  as "deliverQty",
-				ACTUAL_QTY  as "actualQty"
+				ACTUAL_QTY  as "actualQty",
+		PCS_ID  as "pcsId"
 		FROM ${hggpSchema}.HGKC014A WHERE 1=1
         <include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -255,12 +259,13 @@
 			DEPOSIT_UNIT_WEIGHT ,
 			DEPOSIT_WEIGHT,  <!-- 入库重量 -->
 		DELIVER_QTY,
-		ACTUAL_QTY
+		ACTUAL_QTY,
+		                                    PCS_ID
 		)
 		VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
 		#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #whCode#, #whName#, #parentId#, #contractCode#,
 		#depositCode#,#inventType#, #productCode#, #productName#, #specId#, #spec#, #unit#, #depositQty#, #depositUnitWeight#, #depositWeight#,
-		        #deliverQty#, #actualQty#)
+		        #deliverQty#, #actualQty#, #pcsId#)
 	</insert>
 
 	<delete id="delete">
@@ -298,7 +303,8 @@
 			DEPOSIT_UNIT_WEIGHT = #depositUnitWeight#,
 			DEPOSIT_WEIGHT = #depositWeight#,  <!-- 入库重量 -->
 			DELIVER_QTY = #deliverQty#,
-			ACTUAL_QTY = #actualQty#
+			ACTUAL_QTY = #actualQty#,
+		    PCS_ID = #pcsId#
 		WHERE
 		ID = #id#
 	</update>

src/main/webapp/HG/KC/HGKC014A.jsp

@@ -45,6 +45,14 @@
                          displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
                          data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
+            <EF:EFColumn ename="deliverQty" cname="退货入库数量" width="100" enable="false" format="{0:N0}" editType="text"
+                         displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
+                         data-regex="/^-?[0-9]{1,17}?$/" readonly="false"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
+            <EF:EFColumn ename="actualQty" cname="实际入库数量" width="100" enable="false" format="{0:N0}" editType="text"
+                         displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
+                         data-regex="/^-?[0-9]{1,17}?$/" readonly="false"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>