托书参照成衣增加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/VO/SyPackingList.java

@@ -90,4 +90,35 @@ public class SyPackingList {
     //客户简称
     private String customerAbbreviation;
 
+    //预托书日期
+    private String shippingOrderDate;
+
+    //经营单位
+    private String unitInOperation;
+    //经营单位地址
+    private String unitInOperationAddress;
+    //装运期限
+    private String latestDateOfShipment;
+    //最终船期
+    private String theFinalShippingDate;
+    //贸易国别
+    private String tradeCountry;
+    //运抵国别
+    private String arriveInCountry;
+    //收货人
+    private String consignee;
+    //收货人地址
+    private String consigneeAddress;
+    //通知人
+    private String notifyParty;
+    //通知人地址
+    private String notifyPartyAddress;
+    //出口口岸
+    private String exportPort;
+    //目的港
+    private String destinationPort;
+    //收汇方式
+    private String exchangeEarningsValue;
+    //成交方式
+    private String termsOfDeliveryvalue;
 }

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

@@ -26,12 +26,19 @@ a.total as number,a.total_Boxes as planQuantity,a.total_Gross_Weight as grossWei
 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,
 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
+c.english_product_name as englishProductName,'成衣' as readyFabric,b.supplier as supplier,d.shipping_order_date as shippingOrderDate,
+d.unit_in_operation as unitInOperation,d.unit_in_operation_address as unitInOperationAddress,d.latest_date_of_shipment as latestDateOfShipment,
+d.the_final_shipping_date as theFinalShippingDate,d.trade_country as tradeCountry,d.arrive_in_country as arriveInCountry,
+d.consignee,d.consignee_address as consigneeAddress,d.notify_party as notifyParty,d.notify_party_address as notifyPartyAddress,
+d.export_port as exportPort,d.destination_port as destinationPort,d.exchange_earnings_value as exchangeEarningsValue,
+d.terms_of_deliveryvalue as termsOfDeliveryvalue
    from sy_packing_list_tailoring a
     left join sy_packing_list_tailoring_item b
     on a.id = b.sy_packing_list_tailoring_id
 			left join sy_declaration_elements c
 		on a.elements_Id = c.id
+		left join sy_letter_deposit d
+		on a.depositary_receipt_no = d.depositary_receipt_no
    ${ew.customSqlSegment}
 
   </select>