|
|
@@ -806,6 +806,7 @@
|
|
|
LEFT JOIN t_corps c ON c.f_id = w.f_corpid
|
|
|
LEFT JOIN t_fees f ON w.f_feeid = f.f_id
|
|
|
<where>
|
|
|
+ w.del_flag = '0'
|
|
|
<if test="map.tWareHouseFees.fCorpid != null and map.tWareHouseFees.fCorpid != ''">and w.f_corpid =
|
|
|
#{map.tWareHouseFees.fCorpid}
|
|
|
</if>
|
|
|
@@ -997,7 +998,7 @@
|
|
|
LEFT JOIN t_vessel tv ON tv.f_id = t.f_vslid
|
|
|
LEFT JOIN t_voyage ty ON ty.f_id = t.f_voyid
|
|
|
<where>
|
|
|
- dict.status = '0'
|
|
|
+ dict.status = '0' and f.del_flag = '0'
|
|
|
AND dict.dict_type = 'data_unitfees'
|
|
|
<if test="map.tWareHouseFees.fCorpid != null and map.tWareHouseFees.fCorpid != ''">and t.f_corpid =
|
|
|
#{map.tWareHouseFees.fCorpid}
|
|
|
@@ -1197,7 +1198,7 @@
|
|
|
LEFT JOIN t_vessel tv ON tv.f_id = t.f_vslid
|
|
|
LEFT JOIN t_voyage ty ON ty.f_id = t.f_voyid
|
|
|
<where>
|
|
|
- dict.status = '0'
|
|
|
+ dict.status = '0' and f.del_flag = '0'
|
|
|
AND dict.dict_type = 'data_unitfees'
|
|
|
<if test="map.tWareHouseFees.fCorpid != null and map.tWareHouseFees.fCorpid != ''">and t.f_corpid =
|
|
|
#{map.tWareHouseFees.fCorpid}
|
|
|
@@ -1348,7 +1349,7 @@
|
|
|
LEFT JOIN t_fees f ON w.f_feeid = f.f_id
|
|
|
LEFT JOIN sys_dict_data dict ON dict.dict_value = w.f_feeUnitid
|
|
|
<where>
|
|
|
- dict.status = '0'
|
|
|
+ dict.status = '0' and w.del_flag = '0'
|
|
|
AND w.del_flag = '0'
|
|
|
AND dict.dict_type = 'data_unitfees'
|
|
|
<if test="map.tWareHouseFees.stlTypeid != null">and w.f_stltypeid = #{map.tWareHouseFees.stlTypeid}</if>
|
|
|
@@ -2680,6 +2681,7 @@
|
|
|
tf.f_dc = #{fDc}
|
|
|
and tw.f_typeid = 1
|
|
|
and tw.del_flag = '0'
|
|
|
+ and tf.del_flag = '0'
|
|
|
<if test="fMblno != null and fMblno != ''">and tw.f_mblno like concat('%', #{fMblno}, '%')</if>
|
|
|
<if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
|
|
|
<if test="fCorpid != null">and tf.f_corpid = #{fCorpid}</if>
|
|
|
@@ -2753,7 +2755,7 @@
|
|
|
LEFT JOIN t_fees f ON w.f_feeid = f.f_id
|
|
|
LEFT JOIN sys_dict_data dict ON dict.dict_value = w.f_feeUnitid
|
|
|
<where>
|
|
|
- dict.status = '0'
|
|
|
+ dict.status = '0' and w.del_flag = '0'
|
|
|
AND dict.dict_type = 'data_unitfees'
|
|
|
<if test="map.tWareHouseFees.stlTypeid != null">and w.f_stltypeid = #{map.tWareHouseFees.stlTypeid}</if>
|
|
|
<if test="map.tWareHouseFees.fCorpid != null and map.tWareHouseFees.fCorpid != ''">and w.f_corpid =
|
纪新园