|  |  |  | @ -33,11 +33,17 @@ | 
			
		
	
		
			
				
					|  |  |  |  |         FROM io_order_detail_result a2 | 
			
		
	
		
			
				
					|  |  |  |  |                      LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk | 
			
		
	
		
			
				
					|  |  |  |  |                      LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp | 
			
		
	
		
			
				
					|  |  |  |  |                      left join auth_warehouse aw on aw.code = a1.fromInvCode | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         <where> | 
			
		
	
		
			
				
					|  |  |  |  |             a1.status = 7 | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="orderIdFk != null and orderIdFk != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND a2.orderIdFk = #{orderIdFk} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="keyWords != null and keyWords != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%')) | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="nameCode != null and nameCode != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND a2.nameCode = #{nameCode} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
	
		
			
				
					|  |  |  | 
 |