|
@@ -1236,7 +1236,7 @@
|
|
t_warehousebillsfees tf
|
|
t_warehousebillsfees tf
|
|
LEFT JOIN t_warehousebills tw ON tf.f_pid = tw.f_id
|
|
LEFT JOIN t_warehousebills tw ON tf.f_pid = tw.f_id
|
|
WHERE
|
|
WHERE
|
|
- tf.f_billtype = 'SQ'
|
|
|
|
|
|
+ tf.f_billtype = 'CK'
|
|
AND tf.del_flag = '0'
|
|
AND tf.del_flag = '0'
|
|
AND tw.del_flag = '0'
|
|
AND tw.del_flag = '0'
|
|
<if test="fBillstatus != null and fBillstatus != ''">and tf.f_billstatus = #{fBillstatus}</if>
|
|
<if test="fBillstatus != null and fBillstatus != ''">and tf.f_billstatus = #{fBillstatus}</if>
|
|
@@ -1281,7 +1281,7 @@
|
|
t_warehousebillsfees tf
|
|
t_warehousebillsfees tf
|
|
LEFT JOIN t_warehousebills tw ON tf.f_pid = tw.f_id
|
|
LEFT JOIN t_warehousebills tw ON tf.f_pid = tw.f_id
|
|
WHERE
|
|
WHERE
|
|
- tf.f_billtype = 'SQ'
|
|
|
|
|
|
+ tf.f_billtype = 'CK'
|
|
AND tf.del_flag = '0'
|
|
AND tf.del_flag = '0'
|
|
AND tw.del_flag = '0'
|
|
AND tw.del_flag = '0'
|
|
<if test="fBillstatus != null and fBillstatus != ''">and tf.f_billstatus = #{fBillstatus}</if>
|
|
<if test="fBillstatus != null and fBillstatus != ''">and tf.f_billstatus = #{fBillstatus}</if>
|