|
|
@@ -1031,7 +1031,7 @@ class ocean_order {
|
|
|
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\",
|
|
|
+ end as \"Shipment 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'
|
|
|
@@ -1046,7 +1046,7 @@ class ocean_order {
|
|
|
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,
|
|
|
+ $tmp_search_without_limit = "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,
|
|
|
@@ -1067,29 +1067,29 @@ class ocean_order {
|
|
|
then ''
|
|
|
else ''
|
|
|
end as \"Other refenrence No.\",
|
|
|
- case when oo.transport_mode ='sea' && oo._schemas ='public'
|
|
|
+ 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' && oo._schemas ='sfs'
|
|
|
+ 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' && oo._schemas ='public'
|
|
|
+ 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' && oo._schemas ='sfs'
|
|
|
+ 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 \"Shipment Type\",
|
|
|
- case when oo.transport_mode ='sea' && oo._schemas ='public'
|
|
|
+ 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' && oo._schemas ='sfs'
|
|
|
+ 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' && oo._schemas ='public'
|
|
|
+ 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' && oo._schemas ='sfs'
|
|
|
+ when oo.transport_mode ='sea' and oo._schemas ='sfs'
|
|
|
then (SELECT sum(cbm) from sfs.oc_container where serial_no = oo.serial_no)
|
|
|
- else cbm
|
|
|
+ else oo.cbm
|
|
|
end as \"Volume\"
|
|
|
from oo";
|
|
|
|
