托书推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1382,6 +1382,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 		 SimpleDateFormat sf = new SimpleDateFormat("yyyy-M-dd 00:00:00.000");
 
+		 //总毛重
+		 BigDecimal totalNetWeight = BigDecimal.ZERO;
+
 		 if(oConvertUtils.isEmpty(syShippingOrder.getId())){
 		 	result.setSuccess(false);
 		 	result.setMessage("未获取到ID!");
@@ -1426,6 +1429,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 List<SyShippingOrderItem> itemList = syShippingOrderMapper.qeuryItemInfo(entity.getId());
 			 //集合转map
 			 for (SyShippingOrderItem li : itemList) {
+				 totalNetWeight = totalNetWeight.add(li.getGrossWeight());
 				 Field[] fieldsList = li.getClass().getDeclaredFields();
 				 Map<String, Object> mapList = new HashMap<String, Object>();
 				 for (Field field : fieldsList) {
@@ -1435,6 +1439,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 listmap.add(mapList);
 			 }
 
+			 //总毛重可能不对，重新替换
+			 map.put("totalGrossWeight",totalNetWeight);
 
 			 //查询人民币信息
 			 List<SyRmb> rmbList = syShippingOrderMapper.rmbList(entity.getId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -114,13 +114,16 @@ a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcin
         <if test='type == "成衣"'>
             left join sy_packing_list_tailoring_item c
             on a.tailoring_fabric_item_id = c.id
+            where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
+            group by c.group_id order by style_number,smail_po desc
         </if>
         <if test='type == "面辅料"'>
             left join sy_packing_list_fabric_item c
             on a.tailoring_fabric_item_id = c.id
+            where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
+            group by a.group_id order by style_number,smail_po desc
         </if>
-  where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
-group by a.group_id order by style_number,smail_po desc
+
     </select>
 
 
@@ -234,10 +237,12 @@ group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice
     <select id="qeuryItemInfo" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 
 select sum(t.grossWeight) as grossWeight,t.orderNumber,t.tailoringFabricItemId,t.pkOrg from (
-select order_number as orderNumber,case when ready_fabric != '成衣' then sum(gross_weight) else gross_weight end as grossWeight,
-tailoring_fabric_item_id as tailoringFabricItemId,pk_org as pkOrg
-from sy_shipping_order_item
-where del_flag = 0 and sy_shipping_order_item_id = #{id}  group by group_id) t  group by t.orderNumber
+select a.purchase_outsourcing_order_no as orderNumber,a.gross_weight as grossWeight,
+a.tailoring_fabric_item_id as tailoringFabricItemId,a.pk_org as pkOrg
+from sy_shipping_order_item a
+left join sy_packing_list_tailoring_item c
+on a.tailoring_fabric_item_id = c.id
+where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id}  group by c.group_id) t  group by t.orderNumber
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -152,8 +152,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     fabricItemIdList.add(str);
                 }
 
-                totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());//总毛重
-                totalNetWeight = totalNetWeight.add(li.getNetWeight());//总净重
+
                 if(li.getReadyFabric().equals("面料") || li.getReadyFabric().equals("辅料")){
                     //查询装箱单面料子表数据
                     QueryWrapper<SyPackingListFabricItem> queryWrapper = new QueryWrapper<SyPackingListFabricItem>();
@@ -256,6 +255,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     for(SyPackingListTailoringItem lit:itemslist){
                         SyShippingOrderItem syShippingOrderItem =  new SyShippingOrderItem();
 
+                        totalGrossWeight = totalGrossWeight.add(lit.getGrossWeight());//总毛重
+                        totalNetWeight = totalNetWeight.add(lit.getNetWeight());//总净重
+
                         //设置创建人
                         syShippingOrderItem.setCreateBy(sysUser.getRealname());
                         //设置创建时间