托书

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,
-  a.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,a.total_gross_weight as totalGrossWeight,
-  a.total_volume as totalVolume,
+  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 boxNumber,
   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.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,
@@ -14,7 +14,7 @@
   left join sy_shipping_order_item b
 	on a.id = b.sy_shipping_order_item_id
   where a.del_flag = 0 and b.del_flag = 0
-
+ ${ew.customSqlSegment}
     </select>
 
 

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

@@ -173,6 +173,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setElementsId(itemli.getElementsId());
                         syShippingOrderItem.setOrderNumber(itemli.getOrderNumber());
 
+
                          itemList.add(syShippingOrderItem);
                     }
                     //查询预装箱但面料数据
@@ -186,6 +187,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     syPackingListFabric.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListFabricService.updateById(syPackingListFabric);
 
+                    //客户简称
+                    syShippingOrder.setClientAbbreviation(syPackingListFabric.getCustomerAbbreviation());
 
                 }else{ //成衣
                     //查询装箱单成衣子表数据
@@ -232,7 +235,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     syPackingListTailoring.setIsReference(1);
                     syPackingListTailoring.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListTailoringService.updateById(syPackingListTailoring);
-
+                    //客户简称
+                    syShippingOrder.setClientAbbreviation(syPackingListTailoring.getCustomerAbbreviation());
                 }
 
             }
@@ -243,6 +247,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             //总箱数
             syShippingOrder.setBoxNumber(boxNumber);
 
+
             syShippingOrderItemService.saveBatch(itemList);
         }
         //新增人名币