| 
					
				 | 
			
			
				@@ -107,7 +107,7 @@ group by a.group_id order by style_number,smail_po desc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,case when ready_fabric != '辅料' then sum(c.meter) else sum(c.actual_declared_quantity) end as meter,sum(a.number) as number,a.unit_price as unitPrice, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 round(sum(a.total_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,'KG' as pcs,a.volume as volume, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-'USD' as curr,'CHIAN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,sum(a.box_number) as boxNumber, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+'USD' as curr,'CHINA' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,sum(a.box_number) as boxNumber, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.factory_Unit_Price as factoryUnitPrice, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 b.declaration_unit as declarationUnit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  from sy_shipping_order_item a 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -126,14 +126,14 @@ where a.sy_shipping_order_item_id =#{id} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 select 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.outerBoxLength,t.outerBoxWidth,t.outerBoxHeight,t.hod,t.unIt,t.emp,t.purchaseOutsourcingOrderNo,t.packId,t.salesman,t.earliestDeliveryDate,t.declarationUnit, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 t.clientAbbreviation from ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 select 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,'CHIAN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+'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, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 c.factory_Unit_Price as factoryUnitPrice,c.outer_box_length as outerBoxLength,c.outer_box_width as outerBoxWidth,c.outer_box_height as outerBoxHeight,c.hod as hod,min(c.hod) as earliestDeliveryDate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-a.pk_org as pkOrg,round((a.unit_price*0.9),2) as unIt,'' as emp,a.purchase_outsourcing_order_no as purchaseOutsourcingOrderNo,c.pack_id as packId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+a.pk_org as pkOrg,round((a.unit_price*0.9),2) as unIt,'' as emp,a.purchase_outsourcing_order_no as purchaseOutsourcingOrderNo,c.pack_id as packId,b.declaration_unit as declarationUnit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  from sy_shipping_order_item a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 left join sy_declaration_elements b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 on a.elements_Id = b.id 
			 |