托书调整

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

@@ -139,7 +139,7 @@ group by a.group_id) t group by t.elementsId,t.smailPo order by t.styleNumber,t.
   select c.hs_code as hsCode,c.declaration_name as declarationName,a.id as tailoringFabricId ,GROUP_CONCAT(b.id) as tailoringFabricItemId,a.document_No as documentNo,a.create_by as createBy,
   a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
   b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as clientAbbreviation,
-  case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,b.actual_declared_quantity as number,
+        round(sum(b.net_weight),2) as number,
    sum(b.rolls) as boxNumber,'0' as volume,
   b.item_Number as itemNumber,b.small_Po as smallPo,round(sum(b.gross_weight),2) as grossWeight,
   round(sum(b.net_weight),2) as netWeight,'0' as totalVolume,b.distribution_Point as distributionPoint,

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

@@ -462,9 +462,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
                 syPackingListFabric.setShippingOrderNumber("");
-                syPackingListFabric.setExportInvoiceNo("");
-                syPackingListFabric.setContainerCode("");
-                syPackingListFabric.setContainerNumber("");
+                //syPackingListFabric.setExportInvoiceNo("");
+                //syPackingListFabric.setContainerCode("");
+                //syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -475,9 +475,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 syPackingListTailoring.setIsReference(0);
                 syPackingListTailoring.setShippingOrderNumber("");
-                syPackingListTailoring.setExportInvoiceNo("");
-                syPackingListTailoring.setContainerCode("");
-                syPackingListTailoring.setContainerNumber("");
+                //syPackingListTailoring.setExportInvoiceNo("");
+                //syPackingListTailoring.setContainerCode("");
+                //syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
         }