code

service/login.class.php

@@ -1335,16 +1335,16 @@ class login {
                         s.event_code as eventcode, s.event_city as eventcity,
                         (select time_zone from public.city_timezone where uncode = s.event_code) as timezone,
                         (select uncity from public.ports where uncode = s.event_code) as uncity,
-                        case when event ='I'  then 'IFFREC'::text
-                            when event ='AE'  then 'IFFONB'::text
-                            when event ='VD'  then 'IFFDEP'::text
-                            when event ='EB' or event ='VA' then 'IFFARR'::text
-                            when event ='UV'  then 'IFFUND'::text
-                            when event ='VA'  then 'IFFAFD'::text
-                            when event ='AV'  then 'IFFCTA'::text
-                            when event ='CT'  then 'IFFICC'::text
-                            when event ='OA' or event ='D'  then 'IFFPPD'::text
-                            when event ='EE'  then 'IFFECP'::text
+                        case when s.event_base ='I'  then 'IFFREC'::text
+                            when s.event_base ='AE'  then 'IFFONB'::text
+                            when s.event_base ='VD'  then 'IFFDEP'::text
+                            when s.event_base ='EB' or s.event_base ='VA' then 'IFFARR'::text
+                            when s.event_base ='UV'  then 'IFFUND'::text
+                            when s.event_base ='VA'  then 'IFFAFD'::text
+                            when s.event_base ='AV'  then 'IFFCTA'::text
+                            when s.event_base ='CT'  then 'IFFICC'::text
+                            when s.event_base ='OA' or s.event_base ='D'  then 'IFFPPD'::text
+                            when s.event_base ='EE'  then 'IFFECP'::text
                             else '' ::text
                         end as milestone_code  
                     from public.ra_online_container_status_v s 

service/ocean_booking.class.php

@@ -308,7 +308,7 @@ class ocean_booking {
                 }
                 $rs[$index]["Status"] = $status;
 
-                $rs[$index]["Transportation Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
+                $rs[$index]["Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
             }
             
             $arrTmp = array('searchData' => $rs, 
@@ -613,7 +613,7 @@ class ocean_booking {
                 $status = "Cancelled";
             }
             $rs[$index]["Status"] = $status;
-            $rs[$index]["Transportation Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
+            $rs[$index]["Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
         }
         common::echo_json_encode(200,array("msg"=>"success","Data" => $rs));
         exit;

service/ocean_order.class.php

@@ -999,7 +999,7 @@ class ocean_order {
                 //返回加密serial_no
                 $rs[$index]["__serial_no"] = common::deCode($val['__serial_no'], 'E');
                 //$rs[$index]["mode"] = "Ocean Freight";
-                $rs[$index]["Transportation Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
+                $rs[$index]["Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
                 //status 改为ocean_milestone里的信息
                 $rs[$index]["Status"] = $rs[$index]["new_status"];
             }
@@ -1443,7 +1443,7 @@ class ocean_order {
             //返回加密serial_no
             $rs[$index]["__serial_no"] = common::deCode($val['__serial_no'], 'E');
             //$rs[$index]["mode"] = "Ocean Freight";
-            $rs[$index]["Transportation Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
+            $rs[$index]["Mode"] = $val['transport_mode'] == 'sea' ? "Ocean Freight" : ($val['transport_mode'] == 'air' ? "Air Freight": "");
             //status 改为ocean_milestone里的信息
             $rs[$index]["Status"] = $rs[$index]["new_status"];
         }

utils/common.class.php

@@ -1834,17 +1834,17 @@ class common {
                     s.event_code as eventcode, s.event_city as eventcity,
                     (select time_zone from public.city_timezone where uncode = s.event_code) as timezone,
                     '' as uncity,
-                    case when event ='I' or event ='TR'  then 'IFFREC'::text
-                        when event ='AE'  then 'IFFONB'::text
-                        when event ='VD'  then 'IFFDEP'::text
-                        when event ='EB' or event ='VA' then 'IFFARR'::text
-                        when event ='UV'  then 'IFFUND'::text
-                        when event ='VA'  then 'IFFAFD'::text
-                        when event ='AV'  then 'IFFCTA'::text
-                        when event ='CT'  then 'IFFICC'::text
-                        when event ='OA' or event ='D'  then 'IFFPPD'::text
-                        when event ='RD'  then 'IFFECR'::text
-                        when event ='EE'  then 'IFFECP'::text
+                    case when s.event_base ='I' or s.event_base ='TR'  then 'IFFREC'::text
+                        when s.event_base ='AE'  then 'IFFONB'::text
+                        when s.event_base ='VD'  then 'IFFDEP'::text
+                        when s.event_base ='EB' or s.event_base ='VA' then 'IFFARR'::text
+                        when s.event_base ='UV'  then 'IFFUND'::text
+                        when s.event_base ='VA'  then 'IFFAFD'::text
+                        when s.event_base ='AV'  then 'IFFCTA'::text
+                        when s.event_base ='CT'  then 'IFFICC'::text
+                        when s.event_base ='OA' or s.event_base ='D'  then 'IFFPPD'::text
+                        when s.event_base ='RD'  then 'IFFECR'::text
+                        when s.event_base ='EE'  then 'IFFECP'::text
                         else '' ::text
                     end as milestone_code  
                 from public.ra_online_container_status_v s 
@@ -1916,17 +1916,17 @@ class common {
             }
             $ctnr_status_sql = "select 
                     (select time_zone from public.city_timezone where uncode = s.event_code) as timezone,
-                    case when event ='I' or event ='TR' then 'IFFREC'::text
-                        when event ='AE'  then 'IFFONB'::text
-                        when event ='VD'  then 'IFFDEP'::text
-                        when event ='EB' or event ='VA' then 'IFFARR'::text
-                        when event ='UV'  then 'IFFUND'::text
-                        when event ='VA'  then 'IFFAFD'::text
-                        when event ='AV'  then 'IFFCTA'::text
-                        when event ='CT'  then 'IFFICC'::text
-                        when event ='OA' or event ='D'  then 'IFFPPD'::text
-                        when event ='RD'  then 'IFFECR'::text
-                        when event ='EE'  then 'IFFECP'::text
+                    case when s.event_base ='I' or s.event_base ='TR' then 'IFFREC'::text
+                        when s.event_base ='AE'  then 'IFFONB'::text
+                        when s.event_base ='VD'  then 'IFFDEP'::text
+                        when s.event_base ='EB' or s.event_base ='VA' then 'IFFARR'::text
+                        when s.event_base ='UV'  then 'IFFUND'::text
+                        when s.event_base ='VA'  then 'IFFAFD'::text
+                        when s.event_base ='AV'  then 'IFFCTA'::text
+                        when s.event_base ='CT'  then 'IFFICC'::text
+                        when s.event_base ='OA' or s.event_base ='D'  then 'IFFPPD'::text
+                        when s.event_base ='RD'  then 'IFFECR'::text
+                        when s.event_base ='EE'  then 'IFFECP'::text
                         else '' ::text
                     end as milestone_code  
                 from public.ra_online_container_status_v s 

utils/utils.class.php

@@ -478,10 +478,12 @@ class utils {
             $detail = "";
             $type = $_REQUEST['model_name'] == "Booking_Search" ? "Booking_Search" : "Ocean_Search";
             //记录最终save 和 default 字段相比的结果
+            // $default_ids = common::excuteListSql("select id,display_name from public.ra_online_search_display_cso where model_name = '$type' 
+            //     and display_name in('Booking No.','MBL No.','HBL No.','Mode','Status',
+            //         'Shipper','Consignee','Origin Agent','Destination Agent','Creation Time','ETD','ETA',
+            //         'Voyage','Vessel','Week','Created by') order by default_order");
             $default_ids = common::excuteListSql("select id,display_name from public.ra_online_search_display_cso where model_name = '$type' 
-                and display_name in('Booking No.','MBL No.','HBL No.','Transportation Mode','Status',
-                    'Shipper','Consignee','Origin Agent','Destination Agent','Creation Time','ETD','ETA',
-                    'Voyage','Vessel','Week','Created by') order by default_order");
+                    and default_display = true  order by default_order");        
 
             $ids = utils::implode(";", $_POST['ids']);
             $save_ids = common::excuteListSql("select id,display_name from public.ra_online_search_display_cso where model_name = '$type'