出运明细更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationCostpayMapper.xml

@@ -17,7 +17,7 @@
 	</select>
 
 	<select id="queryByCostPay" resultType="org.jeecg.modules.cost.entity.SyCostAllocationCostpay">
-		SELECT 901 as setNo,
+		SELECT 101 as setNo,
 		sp.cSPVCode as disbursementSlipNo,
 		sp.cDefine10 as invoicenum,
 		sp.cMaker as preparedBy,
@@ -40,7 +40,7 @@
 			GROUP BY s.cSOCode
 		)
 		union all
-		SELECT 902 as setNo,
+		SELECT 102 as setNo,
 				 sp.cSPVCode as disbursementSlipNo,
 				 sp.cDefine10 as invoicenum,
 				 sp.cMaker as preparedBy,
@@ -63,7 +63,7 @@
 					 GROUP BY s.cSOCode
 				 )
 		union all
-		SELECT 903 as setNo,
+		SELECT 103 as setNo,
 				 sp.cSPVCode as disbursementSlipNo,
 				 sp.cDefine10 as invoicenum,
 				 sp.cMaker as preparedBy,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -536,6 +536,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if(oConvertUtils.isNotEmpty(syShippingDetails.getId())){
 		  queryWrapper.like("t.id",syShippingDetails.getId());
 	  }
+	  //小po
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getSmallPo())){
+		  String[] smllSplit = syShippingDetails.getSmallPo().split(",");
+		  List<String> asList = Arrays.asList(smllSplit);
+		  queryWrapper.in("t.smallPo",asList);
+	  }
 
 	  try {
 		  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
@@ -677,7 +683,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  }
 				  builder1.deleteCharAt(builder1.length()-1);
 				  //创建列名放在第一行
-				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*客户简称*配码规格*箱数*总件数*总毛重*总净重*总体积*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
+				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*客户简称*配码规格*箱数*总件数*总净重*总毛重*总体积*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
 				  String[] params1 =syPreList.get(index).toString(builder.toString(),builder1.toString()).split("\\*");
 				  String[] params2= {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","AA","AB","AC","AD","AE","AF","AG","AH","AI","AJ","AK","AL","AM","AN","AO","AP","AQ","AR","AS","AT","AU","AV","AW","AX","AY","AZ"};
 
@@ -745,15 +751,15 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 						  cell1.setCellFormula("SUM("+params2[8]+"2:"+params2[size]+"2)*"+box+"2");
 						  //cell1.setCellValue("=");
 					  }
-					  //总毛重
+					  //总净重
 					  if(x == params.length-7){
 						  Cell cell1 = row2.createCell(x);
-						  cell1.setCellFormula("ROUND(SUM("+gross+"2*"+box+"2),2)");
+						  cell1.setCellFormula("ROUND(SUM("+net+"2*"+box+"2),2)");
 					  }
-					  //总净重
+					  //总毛重
 					  if(x == params.length-6){
 						  Cell cell1 = row2.createCell(x);
-						  cell1.setCellFormula("ROUND(SUM("+net+"2*"+box+"2),2)");
+						  cell1.setCellFormula("ROUND(SUM("+gross+"2*"+box+"2),2)");
 					  }
 					  //总体积 =长*宽*高*总箱数/1000000
 					  if(x == params.length-5){
@@ -1419,6 +1425,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		 if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			 queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		 }
+		 //小po
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getSmallPo())){
+			 String[] smllSplit = syShippingDetails.getSmallPo().split(",");
+			 List<String> asList = Arrays.asList(smllSplit);
+			 queryWrapper.in("t.smallPo",asList);
+		 }
 
 		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 		 if(flourOrGarment.equals("0")){//面辅料

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -123,9 +123,9 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 }
 
                 //设置物料成分 和 是否TC
-                //根据款号物料名称查询相同数据并赋值,(2023.03.14现改为：订单号+款号+账套)
+                //根据款号物料名称查询相同数据并赋值,(2023.03.14现改为：订单号+款号+账套+物料)
                 QueryWrapper<SyShippingDetailsItem> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("item_number",li.getItemNumber()).eq("order_number",li.getOrderNumber()).eq("del_flag",0);
+                queryWrapper1.eq("item_number",li.getItemNumber()).eq("order_number",li.getOrderNumber()).eq("del_flag",0).eq("inventory_code",li.getInventoryCode());
                 queryWrapper1.orderByDesc("create_time");
                 List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(queryWrapper1);
                 if(list.size()!=0){
@@ -152,9 +152,9 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 entity.setCustomsDeclarationUnitPrice(customsDeclarationUnitPrice);
 
                 //获取报关要素ID
-                //根据条件查询报关要素信息(2023.03.14现改为：订单号+款号+账套)
+                //根据条件查询报关要素信息(2023.03.14现改为：订单号+款号+账套+物料)
                 QueryWrapper<SyDeclarationElements> elementsQueryWrapper = new QueryWrapper<>();
-                elementsQueryWrapper.eq("order_number",li.getOrderNumber()).eq("ac_set_no",li.getOmpoAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0);
+                elementsQueryWrapper.eq("order_number",li.getOrderNumber()).eq("ac_set_no",li.getOmpoAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0).eq("inventory_code",li.getInventoryCode());
                 elementsQueryWrapper.orderByDesc("create_time");
                 List<SyDeclarationElements> elementsList = syDeclarationElementsService.list(elementsQueryWrapper);
                 if(elementsList.size() != 0){