|
@@ -2615,7 +2615,8 @@
|
|
|
where
|
|
|
tw.f_typeid = '1'
|
|
|
and tw.del_flag = '0'
|
|
|
- and f_cargo_planning = '0'
|
|
|
+ and tw.f_cargo_planning = '0'
|
|
|
+ and tw.f_arrival_status != '2'
|
|
|
<if test="fVslid != null ">and tw.f_vslid = #{fVslid}</if>
|
|
|
<if test="fVoyid != null ">and tw.f_voyid = #{fVoyid}</if>
|
|
|
GROUP BY tw.f_vslid,tw.f_voyid
|