| 
					
				 | 
			
			
				@@ -6,7 +6,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 select t.id, t.shippingOrderNumber, t.garmentFactory,t.clientAbbreviation,t.theFinalShippingDate,t.theDocumentsState, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 round(sum(t.totalPrice),2) as money,round(sum(t.grossWeight),2) as totalGrossWeight,sum(t.boxNumber) as boxNumber,t.syStuta, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-t.exportInvoiceNo,t.orderNumber,t.shippingOrderDate,t.smailPo,t.readyFabric,t.pkOrg,t.delFlag,t.distributionPoint, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+t.exportInvoiceNo,t.orderNumber,t.shippingOrderDate,t.smailPo,t.readyFabric,t.pkOrg,t.delFlag,t.distributionPoint,t.isAhaa, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 round(sum(t.volume),3) as totalVolume,t.unitInOperation from ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 select a.id as id,a.shipping_order_number as shippingOrderNumber,b.garment_factory as garmentFactory, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 b.client_abbreviation as clientAbbreviation,a.unit_in_operation as unitInOperation,b.box_number as boxNumber, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -14,7 +14,7 @@ b.gross_weight as grossWeight,b.volume as volume,sum(b.number*b.unit_price) as t 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 a.the_final_shipping_date as theFinalShippingDate,a.export_invoice_no as exportInvoiceNo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 b.order_number as orderNumber,a.shipping_order_date as shippingOrderDate,b.smail_po as smailPo,b.ready_fabric as readyFabric, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 b.pk_org as pkOrg,a.del_flag as delFlag,b.distribution_point as distributionPoint, a.the_documents_state as theDocumentsState, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-a.sy_stuta as syStuta 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+a.sy_stuta as syStuta,a.is_ahaa as isAhaa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  from sy_shipping_order a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 left join sy_shipping_order_item b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ON a.id = b.sy_shipping_order_item_id 
			 |