2024-10-08 委外加工添加退货数量

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC010A.java

@@ -51,6 +51,7 @@ public class HGSC010A extends DaoEPBase {
 	public static final String FIELD_REMAINING_QTY = "remainingQty";    		/* 剩余数量*/
 	public static final String FIELD_REMAINING_UNIT_WEIGHT = "remainingUnitWeight";    		/* 剩余单量*/
 	public static final String FIELD_REMAINING_WEIGHT = "remainingWeight";    		/* 剩余重量*/
+	public static final String FIELD_DELIVER_QTY = "deliverQty";    		/* 退货数量*/
 
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 账套*/
@@ -113,6 +114,7 @@ public class HGSC010A extends DaoEPBase {
 	private BigDecimal remainingQty = new BigDecimal("0");		/* 剩余数量*/
 	private BigDecimal remainingUnitWeight = new BigDecimal("0");		/* 剩余单量*/
 	private BigDecimal remainingWeight = new BigDecimal("0");		/* 剩余重量*/
+	private BigDecimal deliverQty = new BigDecimal("0");		/* 退货数量*/
 
 	/**
 	 * initialize the metadata.
@@ -264,7 +266,12 @@ public class HGSC010A extends DaoEPBase {
 		eiColumn.setDescName("剩余重量");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_DELIVER_QTY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(0);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("退货数量");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -707,6 +714,14 @@ public class HGSC010A extends DaoEPBase {
 		this.remainingUnitWeight = remainingUnitWeight;
 	}
 
+	public BigDecimal getDeliverQty() {
+		return deliverQty;
+	}
+
+	public void setDeliverQty(BigDecimal deliverQty) {
+		this.deliverQty = deliverQty;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -744,6 +759,7 @@ public class HGSC010A extends DaoEPBase {
 		setRemainingQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_QTY)), remainingQty));
 		setRemainingUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_UNIT_WEIGHT)), remainingUnitWeight));
 		setRemainingWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_WEIGHT)), remainingWeight));
+		setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
 	}
 
 	/**
@@ -782,6 +798,7 @@ public class HGSC010A extends DaoEPBase {
 		map.put(FIELD_REMAINING_QTY, StringUtils.toString(remainingQty, eiMetadata.getMeta(FIELD_REMAINING_QTY)));
 		map.put(FIELD_REMAINING_UNIT_WEIGHT, StringUtils.toString(remainingUnitWeight, eiMetadata.getMeta(FIELD_REMAINING_UNIT_WEIGHT)));
 		map.put(FIELD_REMAINING_WEIGHT, StringUtils.toString(remainingWeight, eiMetadata.getMeta(FIELD_REMAINING_WEIGHT)));
+		map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC010A.xml

@@ -159,7 +159,8 @@
 				DEPOSIT_WEIGHT	as "depositWeight",  <!-- 入库重量 -->
 				REMAINING_QTY	as "remainingQty",  <!-- 剩余数量 -->
 				REMAINING_UNIT_WEIGHT	as "remainingUnitWeight", <!-- 剩余单量 -->
-				REMAINING_WEIGHT	as "remainingWeight" <!-- 剩余重量 -->
+				REMAINING_WEIGHT	as "remainingWeight", <!-- 剩余重量 -->
+				DELIVER_QTY  as "deliverQty"
 		FROM ${hggpSchema}.HGSC010A WHERE 1=1
         <include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -282,12 +283,13 @@
 			DEPOSIT_WEIGHT,  <!-- 入库重量 -->
 			REMAINING_QTY,  <!-- 剩余数量 -->
 			REMAINING_UNIT_WEIGHT,
-			REMAINING_WEIGHT  <!-- 剩余重量 -->
+			REMAINING_WEIGHT,  <!-- 剩余重量 -->
+		DELIVER_QTY
 		)
 		VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
 		        #companyCode#, #companyName#, #parentId#, #contractCode#, #inventType#,
 		#productCode#, #productName#, #specId#, #spec#, #unit#, #pcsQty#, #pcsUnitWeight#, #pcsWeight#, #depositQty#, #depositUnitWeight#, #depositWeight#,
-		#remainingQty#, #remainingUnitWeight#, #remainingWeight#)
+		#remainingQty#, #remainingUnitWeight#, #remainingWeight#, #deliverQty#)
 	</insert>
 
 	<delete id="delete">
@@ -323,7 +325,8 @@
 			DEPOSIT_WEIGHT = #depositWeight#,   <!-- 入库重量 -->
 			REMAINING_QTY = #remainingQty#,   <!-- 剩余数量 -->
 		    REMAINING_UNIT_WEIGHT = #remainingUnitWeight#,
-			REMAINING_WEIGHT = #remainingWeight#  <!-- 剩余重量 -->
+			REMAINING_WEIGHT = #remainingWeight#,  <!-- 剩余重量 -->
+			DELIVER_QTY  = #deliverQty#
 		WHERE
 		ID = #id#
 	</update>

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

@@ -74,6 +74,10 @@
                          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位整数！"/>
         </EF:EFGrid>
     </EF:EFRegion>
     <EF:EFRegion id="detail" title="原料信息">