code

service/column.class.php

@@ -185,6 +185,18 @@ class column {
             if($v['database_column_name'] == "other_refenrence_no" && $model_name = "Ocean_Search"){
                 continue;
             }
+            if($v['database_column_name'] == "loadterm" && $model_name = "Ocean_Search"){
+                continue;
+            }
+            if($v['database_column_name'] == "manifest_type" && $model_name = "Ocean_Search"){
+                continue;
+            }
+            if($v['database_column_name'] == "cbm" && $model_name = "Ocean_Search"){
+                continue;
+            }
+            if($v['database_column_name'] == "port_of_transshipment" && $model_name = "Ocean_Search"){
+                continue;
+            }
             if (empty($v['database_column_name'])) {
                 if ($sql == '')
                     $sql .= '\'' . $v['display_name'] . '\'';
@@ -293,7 +305,8 @@ class column {
             "eta" =>array("formatter" =>"date"),
             "qty" =>array("formatter" =>"number","digits"=>0),
             "piece_count" =>array("formatter" =>"number","digits"=>3),
-            "weight" =>array("formatter" =>"number","digits"=>3));
+            "weight" =>array("formatter" =>"number","digits"=>3),
+            "cbm" =>array("formatter" =>"number","digits"=>3));
         }
         if ($type == "Operation_Search"){
             return array("operation_time" =>array("formatter" =>"dateTime"));
@@ -332,7 +345,7 @@ class column {
         $children['General'] = array();
         $children['Parties'] = array();
         $children['Packing'] = array();
-        $children['Date Range'] = array();
+        $children['Time'] = array();
         $children['Places'] = array();
         $children['Transportation'] = array();
         $children['Others'] = array();

service/ocean_order.class.php

@@ -999,7 +999,7 @@ class ocean_order {
             // $ocean_ref_sql = " LEFT JOIN LATERAL ( SELECT string_agg(ref_code ||ref_value, ', ') AS other_refenrence_no
             //                 FROM public.ocean_reference temp WHERE temp.serial_no = oo.serial_no) aa ON true ";
 
-            $sql = "with oo  as (SELECT order_from as _schemas,serial_no as __serial_no, serial_no,transport_mode,
+            $sql = "with oo  as (SELECT order_from as _schemas,serial_no as __serial_no, serial_no,transport_mode,cbm,
                     h_bol as _hbol, isf_bol as _isfbol, consignee_city as _consignee_city,
                     (select user_login from public.kln_user_subscribed us  
                         where lower(us.user_login) = '".strtolower(_getLoginName())."' and us.subscribed_serial_no = kln_ocean.serial_no) as is_subscribe,
@@ -1019,7 +1019,31 @@ class ocean_order {
                     when oo.transport_mode ='air' 
                         then ''
                     else '' 
-                end as \"Other refenrence No.\"
+                end as \"Other refenrence No.\",
+                case when oo.transport_mode ='sea' and oo._schemas ='public'  
+                        then (select loadterm from public.ocean_extend  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' and oo._schemas ='sfs'  
+                        then (select loadterm from sfs.ocean_extend  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Load Term\",
+                case when oo.transport_mode ='sea' and oo._schemas ='public'  
+                        then (select case when manifest_type = 'GPE' then 'LCL' else  manifest_type end from public.ocean  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' and oo._schemas ='sfs'  
+                        then (select case when manifest_type = 'GPE' then 'LCL' else  manifest_type end from sfs.ocean  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Manifest Type\",
+                case when oo.transport_mode ='sea' and oo._schemas ='public'  
+                        then (select port_of_transshipment_name from public.ocean  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' and oo._schemas ='sfs'  
+                        then (select port_of_transshipment_name from sfs.ocean  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Port of Transhipment\",
+                case when oo.transport_mode ='sea' and oo._schemas ='public'  
+                        then (SELECT sum(cbm) from public.oc_container where serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' and oo._schemas ='sfs'  
+                        then (SELECT sum(cbm) from sfs.oc_container where serial_no = oo.serial_no)
+                    else oo.cbm
+                end as \"Volume\"
             from oo";
 
             $tmp_search_without_limit = "with oo  as (SELECT order_from as _schemas,serial_no as __serial_no, serial_no,transport_mode,
@@ -1042,7 +1066,31 @@ class ocean_order {
                     when oo.transport_mode ='air' 
                         then ''
                     else '' 
-                end as \"Other refenrence No.\"
+                end as \"Other refenrence No.\",
+                case when oo.transport_mode ='sea' && oo._schemas ='public'  
+                        then (select loadterm from public.ocean_extend  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' && oo._schemas ='sfs'  
+                        then (select loadterm from sfs.ocean_extend  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Load Term\",
+                case when oo.transport_mode ='sea' && oo._schemas ='public'  
+                        then (select case when manifest_type = 'GPE' then 'LCL' else  manifest_type end from public.ocean  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' && oo._schemas ='sfs'  
+                        then (select case when manifest_type = 'GPE' then 'LCL' else  manifest_type end from sfs.ocean  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Shipment Type\",
+                case when oo.transport_mode ='sea' && oo._schemas ='public'  
+                        then (select port_of_transshipment_name from public.ocean  where  serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' && oo._schemas ='sfs'  
+                        then (select port_of_transshipment_name from sfs.ocean  where  serial_no = oo.serial_no)
+                    else '' 
+                end as \"Port of Transhipment\",
+                case when oo.transport_mode ='sea' && oo._schemas ='public'  
+                        then (SELECT sum(cbm) from public.oc_container where serial_no = oo.serial_no)
+                    when oo.transport_mode ='sea' && oo._schemas ='sfs'  
+                        then (SELECT sum(cbm) from sfs.oc_container where serial_no = oo.serial_no)
+                    else cbm
+                end as \"Volume\"
             from oo";
             
             //$rs = common::excuteListSql($sql);