| 
					
				 | 
			
			
				@@ -119,7 +119,7 @@ ${ew.customSqlSegment} and  t.inventoryCcode not LIKE '19%' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      a.document_no as attributeString1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      a.document_no as attributeString1,a.id as attributeString2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           'ACCESSORIES' as packingType,'NEW' as packingStatus, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            '成衣工厂' as factory, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            a.create_by as preparer,a.create_time as preparationTime 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -130,7 +130,9 @@ ${ew.customSqlSegment} and  t.inventoryCcode not LIKE '19%' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      select b.sort as packingLineNum,b.ompo_id as ompoId,b.supplier_code as supplierCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      select b.sort as packingLineNum,b.ompo_id as ompoId,b.supplier_code as supplierCode,b.shipping_details_id as attributeString1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      b.id as attributeString2,b.order_number as attributeString3,b.size as attributeString4,sy.master_metering as attributeString5, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      b.r_supplier_code as attributeString6, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            b.ompo_id_item as moDetailId,b.item_number as styleNo,b.colour as color,b.pur_or_sub_order as poNo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            b.inventory_code as itemCode,b.inventory_name as itemDesc,c.declaration_name as declarationName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            b.material_composition as composition,'0' as width,'0' as rolls,b.shipment_quantity as planPackingQty, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -140,6 +142,8 @@ ${ew.customSqlSegment} and  t.inventoryCcode not LIKE '19%' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from sy_shipping_details_item b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join sy_declaration_elements c 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         on b.elements_id = c.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        left join sy_order_data_item sy 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        on b.sy_order_data_item_id = sy.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         where b.del_flag = 0 and b.shipping_details_id = #{shippingDetailsId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |