code

service/ocean_booking.class.php

@@ -281,7 +281,7 @@ class ocean_booking {
             $ocean_dest_sql = "";
             //合并显示两个特殊字段 voyage_m_voyage/vessel_m_vessel
             $sql = "SELECT order_from as _schemas, serial_no as __serial_no, 
-                        color,transport_mode,transport_mode_extend, bol_type, m_voyage as _m_voyage, m_vessel as _m_vessel," .
+                        color,transport_mode,transport_mode_extend, bol_type, m_voyage as _m_voyage, m_vessel as _m_vessel,f_eta as _f_eta," .
                         column::getInstance()->getSearchSqlForDisplay('Booking_Search') . " from public.kln_booking $ocean_dest_sql " . $sqlWhere . " order by $order_by limit " . $ps . " offset " . ($cp - 1) * $ps;
             
             //$rs = common::excuteListSql($sql);
@@ -298,6 +298,12 @@ class ocean_booking {
                 if(array_key_exists("f_voyage", $val)){
                     $rs[$index]["f_voyage"] = utils::outDisplayForMerge($val['f_voyage'],$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'];
+                }
+
                 //返回加密serial_no
                 $rs[$index]["__serial_no"] = common::deCode($val['__serial_no'], 'E');
 
@@ -630,6 +636,10 @@ class ocean_booking {
             if(array_key_exists("f_voyage", $val)){
                 $rs[$index]["f_voyage"] = utils::outDisplayForMerge($val['f_voyage'],$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'];
+            }
             //返回加密serial_no
             $rs[$index]["__serial_no"] = common::deCode($val['__serial_no'], 'E');
 
@@ -712,6 +722,9 @@ class ocean_booking {
         $ocean['shippr_uncode'] = $ocean['place_of_receipt_uncode'];
         $ocean['consignee_uncode'] = $ocean['place_of_delivery_uncode'];
 
+        //booking对 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'];
         $codeinfo = common::getCityPortsInfo($uncodes);