code

service/login.class.php

@@ -1160,7 +1160,7 @@ class login {
 
     private function getTrackingInfo($reference_number){
         $sql = "SELECT o.* ,sh.*, cn.* ,aa.*,dd.*,
-                oo.*,
+                oo.*
                 from public.ocean o 
                 LEFT JOIN LATERAL ( SELECT incoterms as incoterms,tracking_no as _tracking_no,
                     shippr_uncode,shipper_city,
@@ -1249,7 +1249,7 @@ class login {
         //处理basicInfo信息数据
         $vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
         $voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
-        $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['carrier_booking'],
+        $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['booking_no'],
             "PO_NO" =>$ocean['po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
             "Incoterm" =>$ocean['incoterms'],"Service_Type" =>$ocean['service']);
 

service/ocean_order.class.php

@@ -1318,7 +1318,7 @@ class ocean_order {
         //处理basicInfo信息数据
         $vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
         $voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
-        $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['carrier_booking'],
+        $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['booking_no'],
             "PO_NO" =>$ocean['po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
             "Incoterm" =>$ocean['incoterms'],"Service_Type" =>$ocean['service']);
         $data['basicInfo'] = $basicInfo;