|
|
@@ -115,13 +115,13 @@ a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcin
|
|
|
left join sy_packing_list_tailoring_item c
|
|
|
on a.tailoring_fabric_item_id = c.id
|
|
|
where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
|
|
|
- group by c.sy_packing_list_tailoring_id order by a.supplier,a.style_number,a.smail_po,a.english_name,a.unit_price
|
|
|
+ group by a.tailoring_fabric_id order by a.supplier,a.salesman,a.style_number,a.smail_po,a.unit_price
|
|
|
</if>
|
|
|
<if test='type == "面辅料"'>
|
|
|
left join sy_packing_list_fabric_item c
|
|
|
on a.tailoring_fabric_item_id = c.id
|
|
|
where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
|
|
|
- group by a.sy_packing_list_fabric_id order by style_number,smail_po desc
|
|
|
+ group by a.tailoring_fabric_id order by style_number,smail_po desc
|
|
|
</if>
|
|
|
|
|
|
</select>
|
|
|
@@ -149,12 +149,12 @@ where a.sy_shipping_order_item_id =#{id}
|
|
|
<!-- 成衣托书发票-->
|
|
|
<select id="queryEelement" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
|
|
|
|
|
|
-select t.supplier,t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.englishProductName,sum(t.number) as number,round(t.unitPrice,2) as unitPrice,
|
|
|
+select t.preDate,t.supplier,t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.englishProductName,sum(t.number) as number,round(t.unitPrice,2) as unitPrice,
|
|
|
round(sum(t.totalPrice),2) as totalPrice,round(sum(t.grossWeight),2) as grossWeight,round(sum(t.netWeight),2) as netWeight,t.pcs,t.pacs,
|
|
|
round(sum(t.volume),3) as volume,t.curr,t.dree,t.place,t.certificate,t.styleNumber,t.smailPo,t.orderNumber,t.ctns,t.kgs,t.cbm,pkOrg,t.factoryUnitPrice,
|
|
|
t.outerBoxLength,t.outerBoxWidth,t.outerBoxHeight,t.hod,t.unIt,t.emp,t.purchaseOutsourcingOrderNo,t.packId,t.salesman,t.earliestDeliveryDate,t.declarationUnit,
|
|
|
t.clientAbbreviation,t.pcGw,t.priceGw from (
|
|
|
-select a.garment_factory as garmentFactory,a.supplier,GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(a.number) as number,a.unit_price as unitPrice,
|
|
|
+select DATE_FORMAT(a.pre_shipment_date,'%y-%m-%d') as preDate,a.garment_factory as garmentFactory,a.supplier,GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(a.number) as number,a.unit_price as unitPrice,
|
|
|
sum(a.number*a.unit_price) as totalPrice,a.gross_weight as grossWeight,a.net_weight as netWeight,a.master_metering as pcs,a.volume as volume,a.elements_Id as elementsId,
|
|
|
'USD' as curr,'CHINA' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber,
|
|
|
a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'PCS' as pacs,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.salesman as salesman,'PC' as pcGw,'/PC' as priceGw,
|
|
|
@@ -166,7 +166,7 @@ on a.elements_Id = b.id
|
|
|
left join sy_packing_list_tailoring_item c
|
|
|
on a.tailoring_fabric_item_id = c.id
|
|
|
where a.sy_shipping_order_item_id =#{id}
|
|
|
-group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice order by t.garmentFactory,t.salesman,t.styleNumber
|
|
|
+group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice order by t.supplier,t.salesman,t.styleNumber,t.smailPo,t.unitPrice
|
|
|
|
|
|
</select>
|
|
|
|
zengtx