|  | @@ -53,7 +53,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 | 
	
		
			
				|  |  |     sum(b.rolls) as planQuantity,
 | 
	
		
			
				|  |  |    b.item_Number as itemNumber,b.small_Po as smallPo,sum(b.gross_weight) as grossWeight,
 | 
	
		
			
				|  |  |    sum(b.net_weight) as netWeight,'0' as totalVolume,b.distribution_Point as distributionPoint,
 | 
	
		
			
				|  |  | -  a.container_Code as containerCode,b.price,b.total_Price as totalPrice,b.pre_Delivery_Date as preDeliveryDate,
 | 
	
		
			
				|  |  | +  a.container_Code as containerCode,b.price,sum(b.total_Price) as totalPrice,b.pre_Delivery_Date as preDeliveryDate,
 | 
	
		
			
				|  |  |    b.salesman as salesman,b.sales_Department as salesDepartment,b.pur_Or_Sub_Order as purOrSubOrder,
 | 
	
		
			
				|  |  |    c.english_product_name as englishProductName,b.order_Number as orderNumber,'面料' as readyFabric from sy_packing_list_fabric a
 | 
	
		
			
				|  |  |      left join sy_packing_list_fabric_item b
 | 
	
	
		
			
				|  | @@ -83,7 +83,11 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 | 
	
		
			
				|  |  |  SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,create_by as createBy,
 | 
	
		
			
				|  |  | -sum(number) as number, box_number as boxNumber, gross_weight as grossWeight, net_weight as netWeight, case when ready_fabric != '成衣' then volume else volume end as volume,sum(total_price) as totalPrice,
 | 
	
		
			
				|  |  | +sum(number) as number,
 | 
	
		
			
				|  |  | +case when ready_fabric != '成衣' then sum(box_number) else box_number end as boxNumber,
 | 
	
		
			
				|  |  | +case when ready_fabric != '成衣' then sum(gross_weight) else gross_weight end as grossWeight,
 | 
	
		
			
				|  |  | +case when ready_fabric != '成衣' then sum(net_weight) else net_weight end as netWeight,
 | 
	
		
			
				|  |  | +case when ready_fabric != '成衣' then volume else volume end as volume,sum(total_price) as totalPrice,
 | 
	
		
			
				|  |  |  distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 | 
	
		
			
				|  |  |  salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
 | 
	
		
			
				|  |  |   memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(tailoring_fabric_item_id) as tailoringFabricItemId,client_abbreviation as clientAbbreviation
 |