预托书，托书调整金额字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -81,8 +81,8 @@ on a.id = b.sy_pre_assembled_packing_list_id
     <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
 select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
 b.client_abbreviation as clientAbbreviation,a.exchange_earnings_value as exchangeEarningsValue,b.sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
-b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
-sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
+b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
+a.money as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
 a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
 a.the_documents_state as theDocumentsState from sy_letter_deposit a
 left join sy_letter_deposit_item b
@@ -94,8 +94,8 @@ on a.id = b.sy_letter_deposit_id
     <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
         select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
-total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
-container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
+sum(total_gross_weight) as totalGrossWeight,sum(total_net_weight) as totalNetWeight,sum(total_volume) as totalVolume,distribution_point as distributionPoint,
+container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,sum(total_price) as totalPrice,
 hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubOrder,supplier,client_abbreviation as clientAbbreviation
          from sy_letter_deposit_item
          where del_flag = 0 and sy_letter_deposit_id = #{syId} group by letter_groupid

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -97,6 +97,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             //syLetterDeposit.setTheDocumentsState("0");//状态
         }
         syLetterDeposit.setDelFlag("0");
+        syLetterDeposit.setClientAbbreviation(syLetterDeposit.getSyLetterDepositItemList().get(0).getClientAbbreviation());
         //syLetterDeposit.setClientAbbreviation(syLetterDeposit.getSyLetterDepositItemList().get(0).get)
         //新增子表
         List<SyLetterDepositItem> list = syLetterDeposit.getSyLetterDepositItemList();
@@ -152,15 +153,13 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setBoxNumber(syper.getBoxNumber());
                     itenPojo.setTotal(syper.getTotal());
                     itenPojo.setNetWeight(syper.getNetWeight());
-                    itenPojo.setTotalNetWeight(syper.getTotalNetWeight());
                     itenPojo.setGrossWeight(syper.getGrossWeight());
-                    itenPojo.setTotalGrossWeight(syper.getTotalGrossWeight());
-                    itenPojo.setTotalNetWeight(syper.getTotalNetWeight());
+                    itenPojo.setTotalGrossWeight(syper.getTotalGrossWeight());//毛重
                     itenPojo.setOuterBoxHeight(syper.getOuterBoxHeight());
                     itenPojo.setOuterBoxLength(syper.getOuterBoxLength());
-                    itenPojo.setTotalNetWeight(syper.getTotalNetWeight());
+                    itenPojo.setTotalNetWeight(syper.getTotalNetWeight());//净重
                     itenPojo.setTotalPrice(syper.getTotalPrice());
-                    itenPojo.setTotalVolume(syper.getTotalVolume());
+                    itenPojo.setTotalVolume(syper.getTotalVolume()); //体积
                     itenPojo.setNetWeightToo(syper.getNetWeightToo());
                     itenPojo.setUnitPrice(syper.getUnitPrice());
                     itenPojo.setPkOrg(syper.getPkOrg());

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

@@ -4,8 +4,8 @@
 
     <select id="syShippingOrderPageList" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
   select a.id,a.shipping_order_number as shippingOrderNumber,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
-  b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,
-  sum(b.gross_weight) as totalGrossWeight,b.volume as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
+  b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,
+  sum(b.gross_weight) as totalGrossWeight,sum(b.volume) as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
   a.money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,
   a.consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,a.the_final_shipping_date as theFinalShippingDate,
   a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,
@@ -25,7 +25,7 @@ b.small_po as smallPo,b.distribution_point as distributionPoint,b.spur_Or_Sub_Or
 a.total as number,a.total_Boxes as planQuantity,a.total_Gross_Weight as grossWeight,a.total_Net_Weight as netWeight,
 a.total_Volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
 a.depositary_receipt_no as depositaryReceiptNo,b.garment_factory as garmentFactory,b.unit_price as price,
-b.total_price as totalPrice,a.create_by as createBy,b.salesman as salesman,b.sales_Department as salesDepartment,
+a.total_price as totalPrice,a.create_by as createBy,b.salesman as salesman,b.sales_Department as salesDepartment,
 c.english_product_name as englishProductName,'成衣' as readyFabric,b.supplier as supplier
    from sy_packing_list_tailoring a
     left join sy_packing_list_tailoring_item b
@@ -76,7 +76,7 @@ c.english_product_name as englishProductName,'成衣' as readyFabric,b.supplier
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,create_by as createBy,
-sum(number) as number, sum(box_number) as planQuantity, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,sum(total_price) as totalPrice,
+sum(number) as number, box_number as planQuantity, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,sum(total_price) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
  memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId

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

@@ -181,8 +181,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setGrossWeight(itemli.getGrossWeight());
                         totalGrossWeight.add(itemli.getGrossWeight());
                         syShippingOrderItem.setNetWeight(itemli.getNetWeight());
-                        syShippingOrderItem.setVolume(itemli.getTotalVolume());
-                        totalVolume.add(itemli.getTotalVolume());
+                        syShippingOrderItem.setVolume(BigDecimal.ZERO);
+                        totalVolume.add(BigDecimal.ZERO);
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
                         syShippingOrderItem.setUnitPrice(itemli.getPrice());
                         syShippingOrderItem.setPreShipmentDate(itemli.getPreDeliveryDate());