|  | @@ -504,7 +504,7 @@
 | 
	
		
			
				|  |  |              FROM t_warehousebills
 | 
	
		
			
				|  |  |              where
 | 
	
		
			
				|  |  |              del_flag = '0'
 | 
	
		
			
				|  |  | -            and f_billtype in ('SJCK')
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              GROUP BY
 | 
	
		
			
				|  |  |          f_warehouseid
 | 
	
		
			
				|  |  |          ) TTL ON TTL.f_warehouseid = TW.f_id
 | 
	
	
		
			
				|  | @@ -707,7 +707,7 @@
 | 
	
		
			
				|  |  |          <where>
 | 
	
		
			
				|  |  |              TW.del_flag = '0'
 | 
	
		
			
				|  |  |              AND TW.f_warehouseid = #{wareHouseId}
 | 
	
		
			
				|  |  | -            <if test="countType != null and countType != '' and countType == 'SJRK'">
 | 
	
		
			
				|  |  | +            <if test="countType != null and countType != ''">
 | 
	
		
			
				|  |  |                  and TW.f_billtype = #{countType}
 | 
	
		
			
				|  |  |              </if>
 | 
	
		
			
				|  |  |          </where>
 |