code

service/column.class.php

@@ -49,6 +49,11 @@ class column {
 
     //改为从新的配置表和配置信息，与旧的分开
     public function getDisplayColumn($model_name, $isin = true) {
+        //测试服务器，改为UAT字段
+        if(utils::startWith($_SERVER["HTTP_HOST"],"online-beta.kln.com")){
+            $model_name = "UAT_".$model_name;
+        }
+
         $rs = null;
         $sql = "select ids from public.ra_online_search_display_config_cso where lower(login_name)='" . strtolower(_getLoginName()) . "' and lower(model_name) = '" . strtolower($model_name) . "'";
         $rs = common::excuteOneSql($sql);
@@ -101,6 +106,11 @@ class column {
     }
 
     public function saveSettingDisplay($newid, $search_id, $model_name) {
+        //测试服务器，改为UAT字段
+        if(utils::startWith($_SERVER["HTTP_HOST"],"online-beta.kln.com")){
+            $model_name = "UAT_".$model_name;
+        }
+		
         global $db;
         $login_name = _getLoginName();
         $db->StartTrans();
@@ -129,6 +139,11 @@ class column {
     }
 
     public function getSearchSql($model_name) {
+        //测试服务器，改为UAT字段
+        if(utils::startWith($_SERVER["HTTP_HOST"],"online-beta.kln.com")){
+            $model_name = "UAT_".$model_name;
+        }
+
         $sql = "";
         $ss = "SELECT database_column_name, display_name FROM public.ra_online_search_display_cso WHERE lower(model_name) = '" . strtolower($model_name) . "'";
         if (_isCustomerLogin())
@@ -151,6 +166,11 @@ class column {
 
     //search 查询
     public function getSearchSqlForDisplay($model_name) {
+        //测试服务器，改为UAT字段
+        if(utils::startWith($_SERVER["HTTP_HOST"],"online-beta.kln.com")){
+            $model_name = "UAT_".$model_name;
+        }
+
         $sql = "";
         $ss = "SELECT database_column_name, display_name FROM public.ra_online_search_display_cso WHERE lower(model_name) = '" . strtolower($model_name) . "'";
         if (_isCustomerLogin())
@@ -190,6 +210,11 @@ class column {
     }
 
     public function getDisplayColumnAllReomveDefault($model_name) {
+        //测试服务器，改为UAT字段
+        if(utils::startWith($_SERVER["HTTP_HOST"],"online-beta.kln.com")){
+            $model_name = "UAT_".$model_name;
+        }
+
         $sql = "SELECT id, display_name as name, database_column_name as db,database_column_name, column_width,group_name FROM public.ra_online_search_display_cso WHERE  active=true and lower(model_name) = '" . strtolower($model_name) . "'";
         if (_isCustomerLogin())
             $sql .= ' and customer_display=true';
@@ -242,7 +267,7 @@ class column {
             return array("booking_no" =>array("type" =>"link"),
             "h_bol" =>array("type" =>"link"),
             "mode" =>array("type" =>"mode"),
-            "'Ocean Freight'" =>array("type" =>"mode"),
+            "transport_mode" =>array("type" =>"mode"),
             "status" =>array("type" =>"status"),
             "created_time" =>array("formatter" =>"dateTime"),
             "confirmation_time" =>array("formatter" =>"dateTime"),
@@ -253,7 +278,7 @@ class column {
             return array("booking_no" =>array("type" =>"link"),
             "h_bol" =>array("type" =>"link"),
             "mode" =>array("type" =>"mode"),
-            "'Ocean Freight'" =>array("type" =>"mode"),
+            "transport_mode" =>array("type" =>"mode"),
             "status" =>array("type" =>"status"),
             "created_time" =>array("formatter" =>"dateTime"),
             "etd" =>array("formatter" =>"date"),
@@ -274,6 +299,7 @@ class column {
         $children['Reference No.'] = array();
         $children['General'] = array();
         $children['Parties'] = array();
+        $children['Packing'] = array();
         $children['Time'] = array();
         $children['Places'] = array();
         $children['Transportation'] = array();

service/ocean_order.class.php

@@ -1747,8 +1747,9 @@ class ocean_order {
         //由于这些基础数据还待完善，而且现在提单样式改版也没有显示客户自身的地址数据，所以我们这边的这个取值也要麻烦调整一下：
         //1.Shipment detail顶部的Origin和Destination的取值换成Place of Receipt、Place of Delivery的UNCODE
         //2.Tracking列表页里面字段Origin和Destination先隐藏（客户地址），不做展示
-        $ocean['shippr_uncode'] = $ocean['place_of_receipt_un'];
-        $ocean['consignee_uncode'] = $ocean['place_of_delivery_un'];
+        //Origin和Destination的展示，能不能Origin of Cargo有值就用Origin of Cargo，Origin of Cargo就放Departure Airport? Destination也一樣？
+        $ocean['shippr_uncode'] = !empty($ocean['place_of_receipt_un'])? $ocean['place_of_receipt_un'] : $ocean['fport_of_loading_un'];
+        $ocean['consignee_uncode'] = !empty($ocean['place_of_delivery_un']) ? $ocean['place_of_delivery_un'] : $ocean['mport_of_discharge_un'];
 
         //处理shipment data
         $ocean_milestone_status_code = array();