|
|
@@ -324,34 +324,31 @@
|
|
|
<if test='map.tWareHouseFees.timeReconci != null and map.tWareHouseFees.timeReconci[1] != null and map.tWareHouseFees.timeReconci[1]!= ""'>
|
|
|
and w.f_accamount_date <= #{map.tWareHouseFees.timeReconci[1]}
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'SJRK'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_in_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'SJCK'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_out_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'HQZY'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_trans_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
+ <if test="map.tWareHouseFees.fBilltype == null ">
|
|
|
+ AND dictIn.dict_type in ('st_in_type','st_out_type','st_trans_type')
|
|
|
+ AND dictIn.status = '0'
|
|
|
+ </if>
|
|
|
<if test="map.tWareHouseFees.fBusinessType != null and map.tWareHouseFees.fBusinessType != '' ">
|
|
|
and w.f_business_type in
|
|
|
<foreach collection="map.tWareHouseFees.fBusinessType" item="id" open="(" close=")" separator=",">
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
and t.f_review_date IS NOT NULL
|
|
|
and ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) > 0
|
|
|
</where>
|
|
|
@@ -482,25 +479,25 @@
|
|
|
<if test='map.tWareHouseFees.timeReconci != null and map.tWareHouseFees.timeReconci[1] != null and map.tWareHouseFees.timeReconci[1]!= ""'>
|
|
|
and w.f_accamount_date <= #{map.tWareHouseFees.timeReconci[1]}
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'SJRK'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_in_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'SJCK'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_out_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
<if test="map.tWareHouseFees.fBilltype != null and map.tWareHouseFees.fBilltype == 'HQZY'">
|
|
|
and w.f_billtype = #{map.tWareHouseFees.fBilltype}
|
|
|
AND dictIn.dict_type = 'st_trans_type'
|
|
|
AND dictIn.status = '0'
|
|
|
</if>
|
|
|
-
|
|
|
+ <if test="map.tWareHouseFees.fBilltype == null ">
|
|
|
+ AND dictIn.dict_type in ('st_in_type','st_out_type','st_trans_type')
|
|
|
+ AND dictIn.status = '0'
|
|
|
+ </if>
|
|
|
<if test="map.tWareHouseFees.fBusinessType != null and map.tWareHouseFees.fBusinessType != '' ">
|
|
|
and w.f_business_type in
|
|
|
<foreach collection="map.tWareHouseFees.fBusinessType" item="id" open="(" close=")" separator=",">
|
maxianghua