code

service/ocean_order.class.php

@@ -2144,11 +2144,11 @@ class ocean_order {
             $routes = array(array("mode" =>"Ocean Freight","mode_label" =>"Sea", "origin" =>$ocean['shippr_uncode'],
                 "destination" => $ocean['port_of_transshipment_un'],
                 "etd" => $ocean['f_etd'],"atd" => $ocean['atd'],
-                "eta" =>$ocean['f_eta'],"ata" =>"",
+                "eta" =>$ocean['f_eta'],"ata" =>$EDIDate['VA_RELAY'],
                 "vessel" =>$ocean['f_vessel'],"voyageNo" =>$ocean['f_voyage']));
             $routes[] = array("mode" =>"Ocean Freight", "mode_label" =>"Sea","origin" =>$ocean['port_of_transshipment_un'],
                 "destination" => $ocean['consignee_uncode'],
-                "etd" => $ocean['m_etd'],"atd" => "",
+                "etd" => $ocean['m_etd'],"atd" => $EDIDate['VD_RELAY'],
                 "eta" =>$ocean['m_eta'],"ata" =>$ocean['ata'],
                 "vessel" =>$ocean['m_vessel'],"voyageNo" =>$ocean['m_voyage']);
         }else{

utils/common.class.php

@@ -1820,7 +1820,9 @@ class common {
         $ctnr_data = common::excuteListSql($ctnr_sql); 
         $containerStatusData = array();
         $VD = "";
-        $VA = "";    
+        $VA = "";
+        $VD_RELAY  = "";
+        $VA_RELAY  = "";    
         foreach ($ctnr_data as $cd){
             //存在柜号为空的数据情况
             if(empty($cd['ctnr'])){
@@ -1875,6 +1877,12 @@ class common {
                         if(strtolower($event['event']) == "va" && !empty($eventdate)){
                             $VA = $eventdate;
                         }
+                        if(strtolower($event['event']) == strtolower("VD_RELAY") && !empty($eventdate)){
+                            $VD_RELAY = $eventdate;
+                        }
+                        if(strtolower($event['event']) == strtolower("VA_RELAY") && !empty($eventdate)){
+                            $VA_RELAY = $eventdate;
+                        }
                     //}
                 }
             //}
@@ -1900,6 +1908,8 @@ class common {
         $data['EDI315TimeAndLocation'] = $EDI315TimeAndLocation;
         $data['VD'] = $VD;
         $data['VA'] = $VA;
+        $data['VD_RELAY'] = $VD_RELAY;
+        $data['VA_RELAY'] = $VA_RELAY;
         return $data;
     }