|  |  |  | @ -134,10 +134,13 @@ | 
			
		
	
		
			
				
					|  |  |  |  |         <where> | 
			
		
	
		
			
				
					|  |  |  |  |             basic_products.diType=1 | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="cpmctymc != '' and cpmctymc != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.cpmctymc = #{cpmctymc} | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="productsName != null and productsName != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.cpmctymc like concat('%',#{productsName},'%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="nameCode != '' and nameCode != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.nameCode = #{nameCode} | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.nameCode like concat('%',#{nameCode},'%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="relIdFk != '' and relIdFk != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND inv_prein_product.relIdFk = #{relIdFk} | 
			
		
	
	
		
			
				
					|  |  |  | @ -153,7 +156,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |                 AND basic_products.ggxh like concat('%',#{ggxh},'%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="batchNo != '' and batchNo != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND inv_prein_product.batchNo = #{batchNo} | 
			
		
	
		
			
				
					|  |  |  |  |                 AND inv_prein_product.batchNo like concat('%',#{batchNo},'%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="productionDate != '' and productionDate != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND inv_prein_product.productionDate = #{productionDate} | 
			
		
	
	
		
			
				
					|  |  |  | 
 |