|  | @@ -2352,8 +2352,8 @@
 | 
	
		
			
				|  |  |              </if>
 | 
	
		
			
				|  |  |              <if test="map.tWareHouseFees.fDestportid != null ">and t.f_destportid = #{map.tWareHouseFees.fDestportid}
 | 
	
		
			
				|  |  |              </if>
 | 
	
		
			
				|  |  | -            <if test="map.tWareHouseFees.fFromDate != null ">and t.f_bsdate >= #{map.tWareHouseFees.fFromDate}</if>
 | 
	
		
			
				|  |  | -            <if test="map.tWareHouseFees.fToDate != null ">and t.f_bsdate <= #{map.tWareHouseFees.fToDate}</if>
 | 
	
		
			
				|  |  | +            <if test="map.tWareHouseFees.fFromDate != null ">and ty.f_ATD >= #{map.tWareHouseFees.fFromDate}</if>
 | 
	
		
			
				|  |  | +            <if test="map.tWareHouseFees.fToDate != null ">and ty.f_ATD <= #{map.tWareHouseFees.fToDate}</if>
 | 
	
		
			
				|  |  |              <if test='map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype != "" and map.tWareHouseFees.fBilltype == "KHDZ" '>
 | 
	
		
			
				|  |  |                  and abs(ifnull(w.f_amount, 0) - ifnull(w.f_accamount, 0)) > 0
 | 
	
		
			
				|  |  |              </if>
 |