| 
					
				 | 
			
			
				@@ -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.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, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+select case when t.istc ='0' then '否' else '是' end as isTc,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,GROUP_CONCAT(DISTINCT t.purchaseOutsourcingOrderNo) as purchaseOutsourcingOrderNo,t.packId,t.salesman,t.earliestDeliveryDate,t.declarationUnit, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 t.clientAbbreviation,t.pcGw,t.priceGw from ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-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, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+select del.istc as isTc,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, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -165,6 +165,8 @@ left join sy_declaration_elements b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 on a.elements_Id = b.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 left join sy_packing_list_tailoring_item c 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 on a.tailoring_fabric_item_id = c.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+left join (select is_tc as istc,item_number as itemNumber,inventory_code as inventoryCode,order_number as orderNumber from sy_shipping_details_item where del_flag = '0' group by item_number,inventory_code,order_number) del 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+on a.style_number = del.itemNumber and b.inventory_code = del.inventoryCode and a.order_number = del.orderNumber 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 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.supplier,t.salesman,t.styleNumber,t.smailPo,t.unitPrice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |