ShuanghongS 1 жил өмнө
parent
commit
f162ec1895

+ 7 - 3
service/login.class.php

@@ -1282,15 +1282,19 @@ class login {
     }
 
     private function trackingSfsSql($reference_number){
-        $sql = "SELECT o.* ,sh.*, cn.* ,aa.*,dd.* ,cc.status as new_status
+        $sql = "SELECT o.* ,sh.*, cn.* ,aa.*,dd.* ,
+                CASE
+	    	        WHEN cc.status is null THEN 'Created'::text
+	    	        ELSE cc.status::text
+		        END AS new_status
             from sfs.ocean o 
-            left join LATERAL (select case when a.code='IFFBCF' then 'Booked'
+            left join LATERAL (select case when a.code='IFFBCF' then 'Created'
                             when a.code='IFFCPU' then 'Cargo Received'
                             when a.code='IFFREC' then 'Cargo Received'
                             when a.code='IFFDEP' then 'Departed'
                             when a.code='IFFARR' then 'Arrived'
                             when a.code='IFFAFD' then 'Completed'
-                            else 'Booked' END as status
+                            else 'Created' END as status
                     from  ocean_milestone a 
             where a.serial_no=o.serial_no 
                 and a.code in (select regexp_split_to_table('IFFBCF,IFFCPU,IFFREC,IFFDEP,IFFARR,IFFAFD', ','))