| 
					
				 | 
			
			
				@@ -594,7 +594,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             leg.f_marks AS fMarks, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             DATE_FORMAT( leg.f_originalbilldate, '%Y-%m-%d' ) AS fOriginalbilldate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            leg.f_cntrno AS fCntrno 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            leg.f_cntrno AS fCntrno, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            leg.f_localcntrno fLocalcntrno 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             t_whgenleg leg 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             left join sys_user u on leg.create_by = u.user_name 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -644,7 +645,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fLocation != null and fLocation ==1 "> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 and leg.f_warehouse_locationid = #{fWarehouseLocationid} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <if test="fLocalcntrno != null  and fLocalcntrno != '' "> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fLocalcntrno != null  and fLocalcntrno != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 and leg.f_localcntrno  LIKE  concat('%', #{fLocalcntrno}, '%') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fLocation != null  and fLocation ==0 "> 
			 |