2024-06-28 生产入库添加存货类型大类

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

@@ -72,7 +72,7 @@ public class HGKC003 extends DaoEPBase {
 	public static final String FIELD_AMOUNT = "amount";    		/* 金额*/
 	public static final String FIELD_STORAGE_TYPE = "storageType";    		/* 入库类型：1：入库 2：退回*/
 	public static final String FIELD_IS_RETURN = "isReturn";    		/* 是否退回*/
-
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_QUALITY_ID = "QUALITY_ID";    		/* 质检单ID*/
@@ -182,6 +182,7 @@ public class HGKC003 extends DaoEPBase {
 	private BigDecimal amount = new BigDecimal("0");		/* 金额*/
 	private Integer storageType;	/* 入库类型：1：入库 2：退回*/
 	private Integer isReturn;	   /* 是否退回：0：否 1：是*/
+	private Integer inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -421,6 +422,10 @@ public class HGKC003 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_IS_RETURN);
 		eiColumn.setDescName("是否退回：0：否 1：是");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -1143,6 +1148,13 @@ public class HGKC003 extends DaoEPBase {
 		this.isReturn = isReturn;
 	}
 
+	public Integer getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(Integer inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
 	/**
 	 * get the value from Map.
 	 *
@@ -1200,6 +1212,7 @@ public class HGKC003 extends DaoEPBase {
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setStorageType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STORAGE_TYPE)), storageType));
 		setIsReturn(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_IS_RETURN)), isReturn));
+		setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -1258,6 +1271,7 @@ public class HGKC003 extends DaoEPBase {
 		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
 		map.put(FIELD_STORAGE_TYPE, StringUtils.toString(storageType, eiMetadata.getMeta(FIELD_STORAGE_TYPE)));
 		map.put(FIELD_IS_RETURN, StringUtils.toString(isReturn, eiMetadata.getMeta(FIELD_IS_RETURN)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

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

@@ -150,6 +150,12 @@
 		<isNotEmpty prepend=" AND " property="isReturn">
 			IS_RETURN = #isReturn#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetail">
+			INVENT_TYPE_DETAIL = #inventTypeDetail#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"
@@ -203,7 +209,8 @@
 		AMOUNT	as "amount",  <!-- 金额 -->
 		STORAGE_TYPE	as "storageType", <!-- 入库类型：1：入库 2：退回 -->
 		IS_RETURN	as "isReturn", <!-- 是否退回：0：否 1：是 -->
-		SUBMIT_STATUS	as "submitStatus"   <!-- 提交状态 -->
+		SUBMIT_STATUS	as "submitStatus",   <!-- 提交状态 -->
+		INVENT_TYPE_DETAIL as "inventTypeDetail"
 		FROM ${hggpSchema}.HGKC003 WHERE 1=1 AND DELETE_FLAG = 0
 		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -272,7 +279,8 @@
 		AMOUNT,  <!-- 金额 -->
 		STORAGE_TYPE,  <!-- 入库类型：1：入库 2：退回 -->
 		IS_RETURN, <!-- 是否退回：0：否 1：是 -->
-		SUBMIT_STATUS
+		SUBMIT_STATUS,
+		INVENT_TYPE_DETAIL
 		)
 		VALUES (#qualityId#,#partSpecId#,#rectificationId#,#partCoefficient#,#accountCode#,
 		        #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#,
@@ -282,7 +290,7 @@
 		        #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#,
 		        #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#,
 		        #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#,
-		        #partThick#, #partSpec#, #price#, #amount#, #storageType#, #isReturn#,#submitStatus#)
+		        #partThick#, #partSpec#, #price#, #amount#, #storageType#, #isReturn#,#submitStatus#,#inventTypeDetail#)
 	</insert>
 
 	<delete id="delete">
@@ -344,7 +352,8 @@
 		AMOUNT	= #amount#,   <!-- 金额 -->
 		STORAGE_TYPE	= #storageType#,  <!-- 入库类型：1：入库 2：退回 -->
 		IS_RETURN	= #isReturn#,  <!-- 是否退回：0：否 1：是 -->
-		SUBMIT_STATUS	= #submitStatus#  <!-- 提交状态 -->
+		SUBMIT_STATUS	= #submitStatus#,  <!-- 提交状态 -->
+		INVENT_TYPE_DETAIL = #inventTypeDetail#
 		WHERE
 		ID = #id#
 	</update>
@@ -433,7 +442,8 @@
 		AMOUNT	as "amount",  <!-- 金额 -->
 		STORAGE_TYPE	as "storageType", <!-- 入库类型：1：入库 2：退回 -->
 		IS_RETURN	as "isReturn", <!-- 是否退回：0：否 1：是 -->
-		SUBMIT_STATUS	as "submitStatus"   <!-- 提交状态 -->
+		SUBMIT_STATUS	as "submitStatus",   <!-- 提交状态 -->
+		INVENT_TYPE_DETAIL as "inventTypeDetail"
 		FROM ${hggpSchema}.HGKC003 WHERE 1=1 AND DELETE_FLAG = 0
 		<isNotEmpty prepend=" AND " property="billDate">
 			LEFT(DEPOSIT_DATE,6) = #billDate#