托书

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

@@ -38,7 +38,7 @@ public class SyPackingList {
     private String garmentFactory;
     /**供应商*/
     @ApiModelProperty(value = "供应商")
-    private String supplierPrintingPlant;
+    private String supplier;
     /**铅分号*/
     @ApiModelProperty(value = "铅分号")
     private String plumbumNo;

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

@@ -26,7 +26,7 @@ b.plan_Quantity as number,b.box_number as planQuantity,sum(b.gross_weight) as gr
 b.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,
-c.english_product_name as englishProductName,'成衣' as readyFabric
+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
     on a.id = b.sy_packing_list_tailoring_id
@@ -41,7 +41,7 @@ c.english_product_name as englishProductName,'成衣' as readyFabric
 
   select a.id as id ,GROUP_CONCAT(b.id) as itemId,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_printing_plant as supplierPrintingPlant,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,
+  b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,
   case when b.u8_Pid is null then sum(b.inventory_quantity) else sum(b.gross_weight) end as Total,
   b.item_Number as itemNumber,b.small_Po as smallPo,b.plan_Quantity as planQuantity,sum(b.gross_weight) as grossWeight,
   sum(b.net_weight) as netWeight,sum(b.total_Volume) as totalVolume,b.distribution_Point as distributionPoint,