code

service/destination_delivery.class.php

@@ -831,6 +831,8 @@ class destination_delivery {
         
             $delivery_address = common::check_input($_POST['delivery_address']);
             $special_requirements = common::check_input($_POST['special_requirements']);
+            $delivery_reference = common::check_input($_POST['delivery_reference']);
+
 
             //检查不能重复添加booking  这里空运没问题，但是会遇到相同hbol 不同的柜子情况，本质上来说就是一条
             //$sqlWhere = ' where ' . common::searchExtendHand_KLN("ocean", $_SESSION["ONLINE_USER"]);
@@ -877,6 +879,9 @@ class destination_delivery {
                 if (!empty($special_requirements)) {
                     $updateSqlSet.= ", special_requirements = '$special_requirements' ";
                 }
+                if (!empty($delivery_reference)) {
+                    $updateSqlSet.= ", delivery_reference = '$delivery_reference' ";
+                }
                 if (!empty($modify_reason)) {
                     $updateSqlSet.= ", modify_reason = '$modify_reason' ";
                 }
@@ -932,14 +937,14 @@ class destination_delivery {
                             serial_no, h_serial_no,address_country,
                             booking_no, h_bol,h_bol_multiple_link,
                             m_bol, ctnr,
-                            consignee, delivery_date, delivery_mode, status, delivery_address,delivery_address_detail, special_requirements, 
+                            consignee, delivery_date, delivery_mode, status, delivery_address,delivery_address_detail, special_requirements,delivery_reference, 
                             recommended_delivery_window_date_from, recommended_delivery_window_date_to, d_address_change_log,
                             recommended_delivery_from, recommended_delivery_to,kln_pic,
                             create_by, created_time, modify_by, update_time)
                     VALUES ('$serial_no', ".$tags_sql.",".$country_sql.",
                             '".$sData['booking_no']."', '".utils::implode(',',$sData['h_bol'])."','".common::check_input(json_encode($sData['h_bol_multiple_link']))."',
                             '".utils::implode(',',$sData['m_bol'])."', '".utils::implode(',',$sData['ctnr'])."',
-                            '".$sData['consignee']."', $delivery_date,'$delivery_mode','$status', '$delivery_address','$delivery_address_detail', '$special_requirements',
+                            '".$sData['consignee']."', $delivery_date,'$delivery_mode','$status', '$delivery_address','$delivery_address_detail', '$special_requirements','$delivery_reference',
                             $recommended_delivery_window_date_from, $recommended_delivery_window_date_to,'',
                             '".$sData['recommended_delivery_from']."', '".$sData['recommended_delivery_to']."','".$sData['kln_pic']."',
                             '"._getLoginName()."', now(), '"._getLoginName()."', now());";
@@ -1311,9 +1316,9 @@ class destination_delivery {
                         on oo.agent = dc.station_code
                     where  1=1 and 
                         case when dc.booking_window = 'Restrictions_ETD_ATD' and COALESCE(dc.booking_window_date_start,'')<>'' and 	COALESCE(dc.booking_window_date_end,'')<>''
-                                then COALESCE(atd, etd) >= (NOW() + (dc.booking_window_date_start ||' days')::INTERVAL)::date and  COALESCE(atd, etd) <= (NOW() + (dc.booking_window_date_end ||' days')::INTERVAL)::date
+                                then COALESCE(atd, etd) >= (NOW() - (dc.booking_window_date_start ||' days')::INTERVAL)::date and  COALESCE(atd, etd) <= (NOW() + (dc.booking_window_date_end ||' days')::INTERVAL)::date
                             when dc.booking_window = 'Restrictions_ETA_ATA' and COALESCE(dc.booking_window_date_start,'')<>'' and 	COALESCE(dc.booking_window_date_end,'')<>''
-                                then COALESCE(ata, eta) >= (NOW() + (dc.booking_window_date_start ||' days')::INTERVAL)::date and  COALESCE(ata, eta) <= (NOW() + (dc.booking_window_date_end ||' days')::INTERVAL)::date
+                                then COALESCE(ata, eta) >= (NOW() - (dc.booking_window_date_start ||' days')::INTERVAL)::date and  COALESCE(ata, eta) <= (NOW() + (dc.booking_window_date_end ||' days')::INTERVAL)::date
                         else 1=1 end 
             ),
             matched_data as (
@@ -1424,14 +1429,14 @@ class destination_delivery {
             select md.*,
                 CASE 
                     WHEN  r.recommended_delivery_from IS NOT NULL AND r.recommended_delivery_to IS NOT NULL THEN
-                        to_char((COALESCE(ata, eta) - (r.recommended_delivery_from ||' days')::INTERVAL)::date, 'YYYY.MM.DD') 
+                        to_char((COALESCE(ata, eta) + (r.recommended_delivery_from ||' days')::INTERVAL)::date, 'YYYY.MM.DD') 
                         || '-' || 
                         to_char((COALESCE(ata, eta) + (r.recommended_delivery_to ||' days')::INTERVAL)::date, 'YYYY.MM.DD') 
                     WHEN  r.recommended_delivery_from IS NULL AND r.recommended_delivery_to IS NOT NULL THEN
                         '-' || 
                         to_char((COALESCE(ata, eta) + (r.recommended_delivery_to || ' days')::INTERVAL)::date, 'YYYY.MM.DD')
                     WHEN r.recommended_delivery_from IS NOT NULL AND r.recommended_delivery_to IS NULL THEN   
-                        to_char((COALESCE(ata, eta) - (r.recommended_delivery_from || ' days')::INTERVAL)::date, 'YYYY.MM.DD')
+                        to_char((COALESCE(ata, eta) + (r.recommended_delivery_from || ' days')::INTERVAL)::date, 'YYYY.MM.DD')
                         || '-' 
                     ELSE '' END 
                 AS date_range,

service/ocean_order.class.php

@@ -2278,18 +2278,18 @@ class ocean_order {
         //处理routes 转船可能有多个情况
         if ($ocean['is_vessel_direct'] <> "t"){
             //不是直航
-            $routes = array(array("mode" =>"Ocean Freight","mode_label" =>"Sea", "origin" =>$ocean['shippr_uncode'],
+            $routes = array(array("mode" =>$_mode,"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" =>$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'],
+            $routes[] = array("mode" =>$_mode, "mode_label" =>"Sea","origin" =>$ocean['port_of_transshipment_un'],
                 "destination" => $ocean['consignee_uncode'],
                 "etd" => $ocean['m_etd'],"atd" => $EDIDate['VD_RELAY'],
                 "eta" =>$ocean['m_eta'],"ata" =>$ocean['ata'],
                 "vessel" =>$ocean['m_vessel'],"voyageNo" =>$ocean['m_voyage']);
         }else{
-            $routes = array(array("mode" =>"Ocean Freight","mode_label" =>"Sea", "origin" =>$ocean['shippr_uncode'],
+            $routes = array(array("mode" =>$_mode,"mode_label" =>"Sea", "origin" =>$ocean['shippr_uncode'],
                 "destination" => $ocean['consignee_uncode'],
                 "etd" => $ocean['f_etd'],"atd" => $ocean['atd'],
                 "eta" =>$ocean['m_eta'],"ata" => $ocean['ata'],
@@ -2443,7 +2443,7 @@ class ocean_order {
         $data['businessPartners'] = $businessPartners;  
     
         //处理routes air不存在中转的
-        $routes = array(array("mode" =>"Air Freight","mode_label" =>"Air", "origin" =>$ocean['shippr_uncode'],
+        $routes = array(array("mode" =>$_mode,"mode_label" =>"Air", "origin" =>$ocean['shippr_uncode'],
                 "destination" => $ocean['consignee_uncode'],
                 "etd" => $ocean['etd'],"atd" => $ocean['atd'],
                 "eta" => $ocean['eta'],"ata" => $ocean['ata'],

utils/common.class.php

@@ -4118,13 +4118,15 @@ class common {
                 total_volume, total_volume_unit,
                 est_delivery_date, est_delivery_time,instructions,
                 create_user, create_time,delivery_vehicle_type,delivery_fuel_type,
-                consignee, consignee_name, consignee_exp,delivery_to_address_sync_key)
+                consignee, consignee_name, consignee_exp,delivery_to_address_sync_key,
+                delivery_reference)
             VALUES ('".$do_serial_no."','".$detail_row_count."','Ocean', '".$oceanInfo['agent']."','".$biztype."','Awaiting Confirmation','".$mode_type."',
                 '".$serial_no."','".$oceanInfo['m_bol']."','".$oceanInfo['h_bol']."','".$oceanInfo['job_no']."',now(),
                 ".$total_pcs.",'".$total_pcs_unit."',".$total_weight.",'".$total_weight_unit."',".$total_volume.",'".$total_volume_unit."',
                 '".$delivery_booking['_delivery_date']."','".$delivery_booking['_delivery_time']."',
                 '".$delivery_booking['special_requirements']."',
-                'KLN_Online',now(),'Subcontractor','Diesel','".$consignee."','".$consignee_name."','".$consignee_exp."','".$consignee_sync_key."');"; 
+                'KLN_Online',now(),'Subcontractor','Diesel','".$consignee."','".$consignee_name."','".$consignee_exp."','".$consignee_sync_key."',
+                '".$oceanInfo['delivery_reference']."');"; 
             
             foreach($ctnrs as $ctnr){
                 $qty = empty($ctnr['qty']) ? "null" : "'".$ctnr['qty']."'";