|
|
@@ -604,6 +604,8 @@ t_voyage ty
|
|
|
LEFT JOIN t_vessel tv ON ty.f_pid = tv.f_id
|
|
|
LEFT JOIN t_address ta ON ty.f_portofloadid = ta.f_id
|
|
|
LEFT JOIN t_address tr ON ty.f_distinationid = tr.f_id
|
|
|
+where ty.f_status = 'T'
|
|
|
+and tv.f_status = 'T'
|
|
|
)ta
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
@@ -619,6 +621,7 @@ tr.f_no fNo,
|
|
|
tw.f_vslid vesselName,
|
|
|
tw.f_voyid voyageName,
|
|
|
CASE
|
|
|
+ WHEN tr.f_no IS NULL THEN 1
|
|
|
WHEN SUBSTR(tr.f_no,1,2) = '20' THEN 1
|
|
|
WHEN SUBSTR(tr.f_no,1,2) ='40' THEN 2
|
|
|
ELSE 0
|
|
|
@@ -628,7 +631,7 @@ t_warehousebills_cntritems tc
|
|
|
LEFT JOIN t_cntrno tn ON tn.f_no = tc.f_cntrno
|
|
|
LEFT JOIN t_cntr tr ON tn.f_typeid = tr.f_id
|
|
|
LEFT JOIN t_warehousebills tw ON tw.f_id = tc.f_pid
|
|
|
-WHERE tr.f_no IS NOT NULL
|
|
|
+WHERE tw.del_flag = 0
|
|
|
)tc
|
|
|
GROUP BY tc.vesselName,tc.voyageName
|
|
|
)tb
|
lazhaoqian