工序质检单生成的生产入库单单重、总重取报工单的

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

@@ -13,6 +13,8 @@ import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.kc.domain.*;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
+import com.baosight.hggp.hg.sc.domain.HGSC008;
+import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.zl.domain.HGZL002;
 import com.baosight.hggp.hg.zl.domain.HGZL004;
 import com.baosight.hggp.util.AssertUtils;
@@ -278,8 +280,10 @@ public class HGKCTools {
 		private static void setHgkc003Data(List<HGZL002> hgzl002List, List<HGKC003> hgkc003List, Integer code, List<HGZL004> hgzl004List) {
 			List<String> inventCodes = hgzl002List.stream().map(HGZL002::getProductCode).collect(Collectors.toList());
 			List<HGPZ005> hgpz005List = HGPZTools.HgPz005.listByInventCodes(inventCodes);
+
 			hgzl002List.forEach(o->{
 				HGPZ005 hgpz005 = hgpz005List.stream().filter(h->h.getInventCode().equals(o.getProductCode())).findAny().orElse(null);
+				HGSC008 hgsc008 = HGSCTools.THGSC008.getById(o.getWorkId());
 				if(Objects.nonNull(hgpz005)){
 					HGKC003 hgkc003 = new HGKC003();
 					hgkc003.setDepositNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.PROD_DEPOSIT_NO));
@@ -302,11 +306,11 @@ public class HGKCTools {
 						return;
 					}
 					//单重
-					BigDecimal invUnitWeight = HGPZTools.HgPz005.calcUnitWeight(hgpz005);
-					hgkc003.setInvUnitWeight(invUnitWeight);
+//					BigDecimal invUnitWeight = HGPZTools.HgPz005.calcUnitWeight(hgpz005);
+					hgkc003.setInvUnitWeight(hgsc008.getSingleWeight());
 					//总重
-					BigDecimal invWeight = invUnitWeight.multiply(hgkc003.getInvQty());
-					hgkc003.setInvWeight(invWeight);
+//					BigDecimal invWeight = invUnitWeight.multiply(hgkc003.getInvQty());
+					hgkc003.setInvWeight(hgsc008.getTotalWeight());
 					hgkc003.setProjCode(o.getProjCode());
 					hgkc003.setProjName(o.getProjName());
 					hgkc003.setPartCode(o.getProductCode());

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

@@ -49,7 +49,7 @@
 			<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
 			<EF:EFColumn ename="otherOutDate" cname="单据日期"  width="100" align="center" editType="date"
 						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
-			<EF:EFColumn ename="otherOutNo" cname="其他入库单号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="otherOutNo" cname="其他出库单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" />
 			<EF:EFColumn ename="whName" cname="仓库名称" hidden="true"/>
 			<EF:EFComboColumn cname="状态" ename="submitStatus" width="90" align="center" enable="false" >