|  |  | @ -287,6 +287,9 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |                 AND (s.code like concat('%', #{key}, '%') or s.name like concat('%', #{key}, '%') or |  |  |  |                 AND (s.code like concat('%', #{key}, '%') or s.name like concat('%', #{key}, '%') or | 
			
		
	
		
		
			
				
					
					|  |  |  |                      s.type like concat('%', #{key}, '%')) |  |  |  |                      s.type like concat('%', #{key}, '%')) | 
			
		
	
		
		
			
				
					
					|  |  |  |             </if> |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             <if test="status != null"> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |              AND s.status = #{status} | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |         </where> |  |  |  |         </where> | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -322,6 +325,9 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="invWarehouseCode != null and invWarehouseCode != ''"> |  |  |  |             <if test="invWarehouseCode != null and invWarehouseCode != ''"> | 
			
		
	
		
		
			
				
					
					|  |  |  |                 AND invWarehouseCode = #{invWarehouseCode} |  |  |  |                 AND invWarehouseCode = #{invWarehouseCode} | 
			
		
	
		
		
			
				
					
					|  |  |  |             </if> |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             <if test="status != null"> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 AND status = #{status} | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |         </where> |  |  |  |         </where> | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |