code

service/ocean_order.class.php

@@ -1086,6 +1086,7 @@ class ocean_order {
 
             $sql = "with oo  as (SELECT oe.*, order_from as _schemas,serial_no as __serial_no, serial_no,transport_mode,transport_mode_extend,
                     h_bol as _hbol, isf_bol as _isfbol, consignee_city as _consignee_city,piece_count as _piece_count,
+                    f_vessel as _f_vessel, f_voyage as _f_voyage,
                     (select user_login from public.kln_user_subscribed us  
                         where lower(us.user_login) = '".strtolower(_getLoginName())."' and us.subscribed_serial_no = kln_ocean.serial_no) as is_subscribe,
                     CASE
@@ -1128,6 +1129,7 @@ class ocean_order {
 
             $tmp_search_without_limit = "with oo  as (SELECT oe.*, order_from as _schemas,serial_no as __serial_no, serial_no,transport_mode,transport_mode_extend,
                     h_bol as _hbol, isf_bol as _isfbol, consignee_city as _consignee_city,piece_count as _piece_count,
+                    f_vessel as _f_vessel, f_voyage as _f_voyage,
                     (select user_login from public.kln_user_subscribed us  
                         where lower(us.user_login) = '".strtolower(_getLoginName())."' and us.subscribed_serial_no = kln_ocean.serial_no) as is_subscribe,
                     CASE
@@ -1180,6 +1182,10 @@ class ocean_order {
                 $rs[$index]["Mode"] = $val['transport_mode_extend'] == 'sea' ? "Ocean Freight" : ($val['transport_mode_extend'] == 'air' ? "Air Freight": 
                                                 ($val['transport_mode_extend'] == 'rail' ? "Rail Freight": 
                                                 ($val['transport_mode_extend'] == 'road' ? "Road Freight": "")));
+
+                $rs[$index]["Vessel/Airline"] = utils::outDisplayForMerge($val['_f_vessel'],$val['Vessel/Airline']);
+                $rs[$index]["Voyage/Flight"] = utils::outDisplayForMerge($val['_f_voyage'],$val['Voyage/Flight']); 
+
                 //status 改为ocean_milestone里的信息
                 $rs[$index]["Status"] = $rs[$index]["new_status"];
                 if($val['transport_mode'] == 'sea'){
@@ -1693,6 +1699,10 @@ class ocean_order {
                         ($val['transport_mode_extend'] == 'air' ?  "Air Freight": 
                         ($val['transport_mode_extend'] == 'rail' ? "Rail Freight": 
                         ($val['transport_mode_extend'] == 'road'? "Road Freight": "")));
+
+            $rs[$index]["Vessel/Airline"] = utils::outDisplayForMerge($val['_f_vessel'],$val['Vessel/Airline']);
+            $rs[$index]["Voyage/Flight"] = utils::outDisplayForMerge($val['_f_voyage'],$val['Voyage/Flight']);   
+                     
             //status 改为ocean_milestone里的信息
             $rs[$index]["Status"] = $rs[$index]["new_status"];
         }