code

service/ocean_booking.class.php

@@ -291,17 +291,17 @@ class ocean_booking {
             //对查询的结果做特殊处理，比如要拼接某个值，合并值等
             foreach($rs as $index => $val) {
                 //合并显示 vessel
-                if(array_key_exists("f_vessel", $val)){
-                    $rs[$index]["f_vessel"] = utils::outDisplayForMerge($val['f_vessel'],$val['_m_vessel']);
+                if(array_key_exists("Voyage/Flight", $val)){
+                    $rs[$index]["Voyage/Flight"] = utils::outDisplayForMerge($val['Voyage/Flight'],$val['_m_vessel']);
                 }
                 //合并显示 voyage
-                if(array_key_exists("f_voyage", $val)){
-                    $rs[$index]["f_voyage"] = utils::outDisplayForMerge($val['f_voyage'],$val['_m_voyage']);
+                if(array_key_exists("Vessel/Airline", $val)){
+                    $rs[$index]["Vessel/Airline"] = utils::outDisplayForMerge($val['Vessel/Airline'],$val['_m_voyage']);
                 }
 
                 //显示 eta
-                if(array_key_exists("m_eta", $val)){
-                    $rs[$index]["m_eta"] = !empty($val['m_eta']) ? $val['m_eta'] : $val['_f_eta'];
+                if(array_key_exists("ETA", $val)){
+                    $rs[$index]["ETA"] = !empty($val['ETA']) ? $val['ETA'] : $val['_f_eta'];
                 }
 
                 //返回加密serial_no
@@ -628,17 +628,17 @@ class ocean_booking {
             }
         }
         foreach($rs as $index => $val) {
-            //合并显示 vessel
-            if(array_key_exists("f_vessel", $val)){
-                $rs[$index]["f_vessel"] = utils::outDisplayForMerge($val['f_vessel'],$val['_m_vessel']);
+            if(array_key_exists("Voyage/Flight", $val)){
+                $rs[$index]["Voyage/Flight"] = utils::outDisplayForMerge($val['Voyage/Flight'],$val['_m_vessel']);
             }
             //合并显示 voyage
-            if(array_key_exists("f_voyage", $val)){
-                $rs[$index]["f_voyage"] = utils::outDisplayForMerge($val['f_voyage'],$val['_m_voyage']);
+            if(array_key_exists("Vessel/Airline", $val)){
+                $rs[$index]["Vessel/Airline"] = utils::outDisplayForMerge($val['Vessel/Airline'],$val['_m_voyage']);
             }
+
             //显示 eta
-            if(array_key_exists("m_eta", $val)){
-                $rs[$index]["m_eta"] = !empty($val['m_eta']) ? $val['m_eta'] : $val['_f_eta'];
+            if(array_key_exists("ETA", $val)){
+                $rs[$index]["ETA"] = !empty($val['ETA']) ? $val['ETA'] : $val['_f_eta'];
             }
             //返回加密serial_no
             $rs[$index]["__serial_no"] = common::deCode($val['__serial_no'], 'E');
@@ -723,7 +723,7 @@ class ocean_booking {
         $ocean['consignee_uncode'] = $ocean['place_of_delivery_uncode'];
 
         //booking对 eta的处理
-        $ocean['m_eta'] = !empty($ocean['m_eta']) ? $ocean['m_eta'] :  $ocean['_f_eta'];
+        $ocean['m_eta'] = !empty($ocean['m_eta']) ? $ocean['m_eta'] :  $ocean['f_eta'];
 
         //获取对应uncode 对应的时间
         $uncodes = $ocean['fport_of_loading_uncode'].";".$ocean['mport_of_discharge_uncode'];