其他入库单字段处理修改

src/main/java/com/baosight/hggp/hg/cb/tools/HGCBTools.java

@@ -245,7 +245,7 @@ public class HGCBTools {
             hgcb002.setInventCode(hgkc006A.getInventCode());
             hgcb002.setInventName(hgkc006A.getInventName());
             hgcb002.setInventRecordId(hgkc006A.getInventRecordId());
-            hgcb002.setSpec(hgkc006A.getPartSpec());
+            hgcb002.setSpec(hgkc006A.getPrdtSpec());
             hgcb002.setIsEstimate(0);
             hgcb002.setQuantity(hgkc006A.getInvQty());
             hgcb002.setWeight(hgkc006A.getInvWeight());
@@ -579,8 +579,8 @@ public class HGCBTools {
          * @return
          */
         public static String buildKey(Map dataMap) {
-            if (dataMap.containsKey(HGKC006A.FIELD_PART_SPEC)){
-                dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC006A.FIELD_PART_SPEC));
+            if (dataMap.containsKey(HGKC006A.FIELD_PRDT_SPEC)){
+                dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC006A.FIELD_PRDT_SPEC));
             }else if (dataMap.containsKey(HGKC008A.FIELD_INV_SPEC)){
                 dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC008A.FIELD_INV_SPEC));
             }else if (dataMap.containsKey(HGKC007A.FIELD_PRDT_SPEC)){

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

@@ -221,7 +221,7 @@ public class ServiceHGKC009 extends ServiceBase {
 			// 1.3、其他入库
 			HGKC006A qtRk = qtRkMap.get(key);
 			kc009.setQtEnterAmount(qtRk == null ? BigDecimal.ZERO : qtRk.getInvQty());
-			kc009.setQtEnterWeight(qtRk == null ? BigDecimal.ZERO : qtRk.getPartWidth());
+			kc009.setQtEnterWeight(qtRk == null ? BigDecimal.ZERO : qtRk.getPrdtWidth());
 			// 1.4、入库
 			kc009.setEnterAmount(kc009.getCgEnterAmount().add(kc009.getScEnterAmount())
 					.add(kc009.getQtEnterAmount()));

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

@@ -73,48 +73,6 @@
 		<isNotEmpty prepend=" AND " property="projName">
 			PROJ_NAME = #projName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtType">
-			PRDT_TYPE = #prdtType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtCode">
-			PRDT_CODE = #prdtCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtName">
-			PRDT_NAME = #prdtName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtLength">
-			PRDT_LENGTH = #prdtLength#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtWidth">
-			PRDT_WIDTH = #prdtWidth#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtThick">
-			PRDT_THICK = #prdtThick#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtSpec">
-			PRDT_SPEC = #prdtSpec#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partType">
-			PART_TYPE = #partType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partCode">
-			PART_CODE = #partCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partName">
-			PART_NAME = #partName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partLength">
-			PART_LENGTH = #partLength#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partWidth">
-			PART_WIDTH = #partWidth#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partThick">
-			PART_THICK = #partThick#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partSpec">
-			PART_SPEC = #partSpec#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="submitStatus">
 			SUBMIT_STATUS = #submitStatus#
 		</isNotEmpty>
@@ -152,20 +110,6 @@
 				PROD_TASK_NO	as "prodTaskNo",  <!-- 生产任务号 -->
 				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 				PROJ_NAME	as "projName",  <!-- 项目名称 -->
-				PRDT_TYPE	as "prdtType",  <!-- 产品类型 -->
-				PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
-				PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
-				PRDT_LENGTH	as "prdtLength",  <!-- 产品-长 -->
-				PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
-				PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
-				PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-				PART_TYPE	as "partType",  <!-- 零件类型 -->
-				PART_CODE	as "partCode",  <!-- 零件编码 -->
-				PART_NAME	as "partName",  <!-- 零件名称 -->
-				PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-				PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-				PART_THICK	as "partThick",  <!-- 零件-厚 -->
-				PART_SPEC	as "partSpec",  <!-- 零件规格 -->
 				SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 				SOURCE_CODE	as "sourceCode",  <!-- 数据来源编号 -->
 				SOURCE	as "source" <!-- 数据来源 -->
@@ -219,25 +163,11 @@
 										PROD_TASK_NO,  <!-- 生产任务号 -->
 										PROJ_CODE,  <!-- 项目编码 -->
 										PROJ_NAME,  <!-- 项目名称 -->
-										PRDT_TYPE,  <!-- 产品类型 -->
-										PRDT_CODE,  <!-- 产品编码 -->
-										PRDT_NAME,  <!-- 产品名称 -->
-										PRDT_LENGTH,  <!-- 产品-长 -->
-										PRDT_WIDTH,  <!-- 产品-宽 -->
-										PRDT_THICK,  <!-- 产品-厚 -->
-										PRDT_SPEC,  <!-- 产品规格 -->
-										PART_TYPE,  <!-- 零件类型 -->
-										PART_CODE,  <!-- 零件编码 -->
-										PART_NAME,  <!-- 零件名称 -->
-										PART_LENGTH,  <!-- 零件-长 -->
-										PART_WIDTH,  <!-- 零件-宽 -->
-										PART_THICK,  <!-- 零件-厚 -->
-										PART_SPEC,  <!-- 零件规格 -->
 										SUBMIT_STATUS,  <!-- 提交状态 -->
 										SOURCE_CODE,  <!-- 数据来源编号 -->
 										SOURCE  <!-- 数据来源 -->
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherEnterDate#, #otherEnterNo#, #whCode#, #whName#, #otherEnterNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partSpec#, #submitStatus#, #sourceCode#, #source#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherEnterDate#, #otherEnterNo#, #whCode#, #whName#, #otherEnterNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #submitStatus#, #sourceCode#, #source#)
 	</insert>
 
 
@@ -267,20 +197,6 @@
 					PROD_TASK_NO	= #prodTaskNo#,   <!-- 生产任务号 -->
 					PROJ_CODE	= #projCode#,   <!-- 项目编码 -->
 					PROJ_NAME	= #projName#,   <!-- 项目名称 -->
-					PRDT_TYPE	= #prdtType#,   <!-- 产品类型 -->
-					PRDT_CODE	= #prdtCode#,   <!-- 产品编码 -->
-					PRDT_NAME	= #prdtName#,   <!-- 产品名称 -->
-					PRDT_LENGTH	= #prdtLength#,   <!-- 产品-长 -->
-					PRDT_WIDTH	= #prdtWidth#,   <!-- 产品-宽 -->
-					PRDT_THICK	= #prdtThick#,   <!-- 产品-厚 -->
-					PRDT_SPEC	= #prdtSpec#,   <!-- 产品规格 -->
-					PART_TYPE	= #partType#,   <!-- 零件类型 -->
-					PART_CODE	= #partCode#,   <!-- 零件编码 -->
-					PART_NAME	= #partName#,   <!-- 零件名称 -->
-					PART_LENGTH	= #partLength#,   <!-- 零件-长 -->
-					PART_WIDTH	= #partWidth#,   <!-- 零件-宽 -->
-					PART_THICK	= #partThick#,   <!-- 零件-厚 -->
-					PART_SPEC	= #partSpec#,   <!-- 零件规格 -->
 					SUBMIT_STATUS	= #submitStatus#,   <!-- 提交状态 -->
 					SOURCE_CODE	= #sourceCode#,   <!-- 提交状态 -->
 					SOURCE	= #source#  <!-- 数据来源 -->
@@ -314,20 +230,6 @@
 		PROD_TASK_NO	as "prodTaskNo",  <!-- 生产任务号 -->
 		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 		PROJ_NAME	as "projName",  <!-- 项目名称 -->
-		PRDT_TYPE	as "prdtType",  <!-- 产品类型 -->
-		PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
-		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
-		PRDT_LENGTH	as "prdtLength",  <!-- 产品-长 -->
-		PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
-		PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
-		PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-		PART_TYPE	as "partType",  <!-- 零件类型 -->
-		PART_CODE	as "partCode",  <!-- 零件编码 -->
-		PART_NAME	as "partName",  <!-- 零件名称 -->
-		PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-		PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-		PART_THICK	as "partThick",  <!-- 零件-厚 -->
-		PART_SPEC	as "partSpec",  <!-- 零件规格 -->
 		SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 		SOURCE_CODE	as "sourceCode",  <!-- 数据来源编号 -->
 		SOURCE	as "source" <!-- 数据来源 -->
@@ -405,20 +307,6 @@
 		PROD_TASK_NO	as "prodTaskNo",  <!-- 生产任务号 -->
 		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 		PROJ_NAME	as "projName",  <!-- 项目名称 -->
-		PRDT_TYPE	as "prdtType",  <!-- 产品类型 -->
-		PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
-		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
-		PRDT_LENGTH	as "prdtLength",  <!-- 产品-长 -->
-		PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
-		PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
-		PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-		PART_TYPE	as "partType",  <!-- 零件类型 -->
-		PART_CODE	as "partCode",  <!-- 零件编码 -->
-		PART_NAME	as "partName",  <!-- 零件名称 -->
-		PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-		PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-		PART_THICK	as "partThick",  <!-- 零件-厚 -->
-		PART_SPEC	as "partSpec",  <!-- 零件规格 -->
 		SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 		SOURCE_CODE	as "sourceCode",  <!-- 数据来源编号 -->
 		SOURCE	as "source" <!-- 数据来源 -->

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

@@ -114,32 +114,8 @@
 		<isNotEmpty prepend=" AND " property="prdtSpec">
 			PRDT_SPEC = #prdtSpec#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partType">
-			PART_TYPE = #partType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partCode">
-			PART_CODE = #partCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partName">
-			PART_NAME = #partName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partLength">
-			PART_LENGTH = #partLength#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partWidth">
-			PART_WIDTH = #partWidth#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partThick">
-			PART_THICK = #partThick#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partCoefficient">
-			PART_COEFFICIENT = #partCoefficient#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partSpec">
-			PART_SPEC = #partSpec#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="partSpecId">
-			PART_SPEC_ID = #partSpecId#
+		<isNotEmpty prepend=" AND " property="prdtCoefficient">
+			PRDT_COEFFICIENT = #prdtCoefficient#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="primaryId">
 			PRIMARY_ID = #primaryId#
@@ -201,15 +177,7 @@
 				PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
 				PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
 				PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-				PART_TYPE	as "partType",  <!-- 零件类型 -->
-				PART_CODE	as "partCode",  <!-- 零件编码 -->
-				PART_NAME	as "partName",  <!-- 零件名称 -->
-				PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-				PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-				PART_THICK	as "partThick",  <!-- 零件-厚 -->
-				PART_COEFFICIENT	as "partCoefficient",  <!-- 零件-系数 -->
-				PART_SPEC	as "partSpec",  <!-- 零件规格 -->
-				PART_SPEC_ID	as "partSpecId",  <!-- 零件规格id -->
+				PRDT_COEFFICIENT	as "prdtCoefficient",  <!-- 产品-系数 -->
 				PRIMARY_ID	as "primaryId",  <!-- 主表id -->
 				PRICE	as "price",  <!-- 单价 -->
 				AMOUNT	as "amount",  <!-- 金额 -->
@@ -272,22 +240,14 @@
 										PRDT_WIDTH,  <!-- 产品-宽 -->
 										PRDT_THICK,  <!-- 产品-厚 -->
 										PRDT_SPEC,  <!-- 产品规格 -->
-										PART_TYPE,  <!-- 零件类型 -->
-										PART_CODE,  <!-- 零件编码 -->
-										PART_NAME,  <!-- 零件名称 -->
-										PART_LENGTH,  <!-- 零件-长 -->
-										PART_WIDTH,  <!-- 零件-宽 -->
-										PART_THICK,  <!-- 零件-厚 -->
-										PART_COEFFICIENT,  <!-- 零件系数 -->
-										PART_SPEC,  <!-- 零件规格 -->
-										PART_SPEC_ID,  <!-- 零件规格id -->
+										PRDT_COEFFICIENT,  <!-- 产品系数 -->
 										PRIMARY_ID,  <!-- 主表id -->
 										PRICE,  <!-- 单价 -->
 										AMOUNT,  <!-- 金额 -->
 										SOURCE,  <!-- 数据来源 -->
 		INVENT_TYPE_DETAIL
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherEnterDate#, #otherEnterNo#, #whCode#, #whName#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #invQty#, #invUnitWeight#, #invWeight#, #otherEnterNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partCoefficient#, #partSpec#,#partSpecId#, #primaryId#, #price#, #amount#, #source#,#inventTypeDetail#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherEnterDate#, #otherEnterNo#, #whCode#, #whName#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #invQty#, #invUnitWeight#, #invWeight#, #otherEnterNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #prdtCoefficient#, #primaryId#, #price#, #amount#, #source#,#inventTypeDetail#)
 	</insert>
 
 	<delete id="delete">
@@ -333,15 +293,7 @@
 					PRDT_WIDTH	= #prdtWidth#,   <!-- 产品-宽 -->
 					PRDT_THICK	= #prdtThick#,   <!-- 产品-厚 -->
 					PRDT_SPEC	= #prdtSpec#,   <!-- 产品规格 -->
-					PART_TYPE	= #partType#,   <!-- 零件类型 -->
-					PART_CODE	= #partCode#,   <!-- 零件编码 -->
-					PART_NAME	= #partName#,   <!-- 零件名称 -->
-					PART_LENGTH	= #partLength#,   <!-- 零件-长 -->
-					PART_WIDTH	= #partWidth#,   <!-- 零件-宽 -->
-					PART_THICK	= #partThick#,   <!-- 零件-厚 -->
-					PART_COEFFICIENT = #partCoefficient#,   <!-- 零件-系数 -->
-					PART_SPEC	= #partSpec#,   <!-- 零件规格 -->
-					PART_SPEC_ID	= #partSpecId#,   <!-- 零件规格id -->
+					PRDT_COEFFICIENT = #prdtCoefficient#,   <!-- 产品-系数 -->
 					PRIMARY_ID	= #primaryId#,   <!-- 主表id -->
 					PRICE	= #price#,   <!-- 单价 -->
 					AMOUNT	= #amount#,   <!-- 金额 -->
@@ -402,15 +354,7 @@
 		A.PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
 		A.PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
 		A.PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-		A.PART_TYPE	as "partType",  <!-- 零件类型 -->
-		A.PART_CODE	as "partCode",  <!-- 零件编码 -->
-		A.PART_NAME	as "partName",  <!-- 零件名称 -->
-		A.PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-		A.PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-		A.PART_THICK	as "partThick",  <!-- 零件-厚 -->
-		A.PART_COEFFICIENT	as "partCoefficient",  <!-- 零件-系数 -->
-		A.PART_SPEC	as "partSpec",  <!-- 零件规格 -->
-		A.PART_SPEC_ID	as "partSpecId",  <!-- 零件规格id -->
+		A.PRDT_COEFFICIENT	as "prdtCoefficient",  <!-- 产品-系数 -->
 		A.PRIMARY_ID	as "primaryId",  <!-- 主表id -->
 		A.PRICE	as "price",  <!-- 单价 -->
 		A.AMOUNT	as "amount",  <!-- 金额 -->

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

@@ -51,6 +51,7 @@
 			<EF:EFColumn ename="prdtLength" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="prdtWidth" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="prdtThick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="prdtCoefficient" cname="系数" enable="false" width="80" align="right" format="{0:N3}" hidden="true"/>
 			<EF:EFColumn ename="invQty" cname="数量"  width="120" align="right" format="{0:N0}"
 						 defaultValue="0"
 						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"