|
@@ -46,7 +46,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
|
|
<!-- 查询装箱单-面料-->
|
|
<!-- 查询装箱单-面料-->
|
|
<select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
|
|
<select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
|
|
|
|
|
|
- select a.id as id ,b.id as itemId,a.document_No as documentNo,a.create_by as createBy,
|
|
|
|
|
|
+ select c.hs_code as hsCode,c.declaration_name as declarationName,a.id as id ,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,
|
|
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 customerAbbreviation,
|
|
b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,
|
|
case when b.u8_Pid is null then b.actual_declared_quantity else b.gross_weight end as Total,b.actual_declared_quantity as number,
|
|
case when b.u8_Pid is null then b.actual_declared_quantity else b.gross_weight end as Total,b.actual_declared_quantity as number,
|
|
@@ -132,7 +132,7 @@ group by a.group_id) t group by styleNumber
|
|
|
|
|
|
<select id="syShippingOrderMerge" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
|
|
<select id="syShippingOrderMerge" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
|
|
|
|
|
|
- select a.id as tailoringFabricId ,GROUP_CONCAT(b.id) as tailoringFabricItemId,a.document_No as documentNo,a.create_by as createBy,
|
|
|
|
|
|
+ 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,
|
|
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,
|
|
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,
|
|
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,
|