ShuanghongS 1 săptămână în urmă
părinte
comite
24578c4e71
1 a modificat fișierele cu 72 adăugiri și 72 ștergeri
  1. 72 72
      utils/common.class.php

+ 72 - 72
utils/common.class.php

@@ -4494,21 +4494,21 @@ class common {
 
     public static function getReportRealDBFiled(){
         $kln_ocean = [
-            "oo.tracking_no" => "tracking_no",
-            "oo.m_bol" => "mbol_mawb_no",
-            "oo.h_bol" => "hbol_hawb_no",
-            "oo.invoice_no" => "shipment_invoice_no",
-            "oo.booking_no" => "booking_no",
-            "COALESCE(oe.import_po_no,oo.po_no)"=>"shipment_po_no",    //代表oo里的组合字段,需要特殊处理
-            "oo.quote_no" => "quote_no",
-            "oo.carrier_booking" => "carrier_booking_no",
-            "oo.contract" => "contract_no",
-            "oo.manifest_hbol" => "manifest_hbol",
-            "oo.transport_mode" => "transportation_mode",
-            "oo.service" => "service_type",
+            "kln_ocean.tracking_no" => "tracking_no",
+            "kln_ocean.m_bol" => "mbol_mawb_no",
+            "kln_ocean.h_bol" => "hbol_hawb_no",
+            "kln_ocean.invoice_no" => "shipment_invoice_no",
+            "kln_ocean.booking_no" => "booking_no",
+            "COALESCE(oe.import_po_no,kln_ocean.po_no)"=>"shipment_po_no",    //代表oo里的组合字段,需要特殊处理
+            "kln_ocean.quote_no" => "quote_no",
+            "kln_ocean.carrier_booking" => "carrier_booking_no",
+            "kln_ocean.contract" => "contract_no",
+            "kln_ocean.manifest_hbol" => "manifest_hbol",
+            "kln_ocean.transport_mode" => "transportation_mode",
+            "kln_ocean.service" => "service_type",
             "oe.manifest_type"=>"shipment_type",
-            "oo.ex_im" => "ex_im",
-            "oo.incoterms" => "incoterms",
+            "kln_ocean.ex_im" => "ex_im",
+            "kln_ocean.incoterms" => "incoterms",
             "oe.loadterm"=>"load_terms",
             "(CASE
                 WHEN (m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Created'::text
@@ -4518,75 +4518,75 @@ class common {
                 WHEN (m_iffdel is not null) THEN 'Completed'::text
                 ELSE 'Created'
             END)" => "status",
-            "oo.carbon_emission" => "total_co2_emission",
-            "oo.qty" => "shipment_qty",
-            "oo.piece_count" => "shipment_gross_weight",
-            "oo.weight" => "chargeable_weight",
+            "kln_ocean.carbon_emission" => "total_co2_emission",
+            "kln_ocean.qty" => "shipment_qty",
+            "kln_ocean.piece_count" => "shipment_gross_weight",
+            "kln_ocean.weight" => "chargeable_weight",
             "oe.volume"=>"shipment_volume",
-            "oo.shipper" => "shipper",
-            "oo.shipper_id" => "shipper_id",
-            "oo.consignee" => "consignee",
-            "oo.consignee_id" => "consignee_id",
-            "oo.notify_party" => "notify_party",
-            "oo.notify_party_id" => "notify_party_id",
-            "oo.billto" => "bill_to",
-            "oo.group_name" => "group_name",
-            "oo.origin" => "origin_agent",
-            "oo.agent" => "destination_agent",
-            "oo.dest_op" => "destination_operator",
-            "oo.sales_rep" => "sales",
-            "oo.etd" => "etd",
-            "oo.eta" => "eta",
-            "oo.created_time" => "creation_time",
-            "oo.atd" => "atd",
-            "oo.ata" => "ata",
-            "oo.shipper_city" => "shipper_city",
-            "oo.consignee_city" => "consignee_city",
-            "oo.place_of_receipt_exp" => "place_of_receipt",
-            "oo.port_of_loading" => "port_of_loading",
-            "oo.port_of_discharge" => "port_of_discharge",
-            "oo.fport_of_loading_un" => "pol_locode",
-            "oo.mport_of_discharge_un" => "pod_locode",
-            "oo.place_of_delivery_exp" => "place_of_delivery",
-            "oo.port_of_transshipment_name" => "port_of_transhipment",
-            "oo.carrier" => "carrier",
+            "kln_ocean.shipper" => "shipper",
+            "kln_ocean.shipper_id" => "shipper_id",
+            "kln_ocean.consignee" => "consignee",
+            "kln_ocean.consignee_id" => "consignee_id",
+            "kln_ocean.notify_party" => "notify_party",
+            "kln_ocean.notify_party_id" => "notify_party_id",
+            "kln_ocean.billto" => "bill_to",
+            "kln_ocean.group_name" => "group_name",
+            "kln_ocean.origin" => "origin_agent",
+            "kln_ocean.agent" => "destination_agent",
+            "kln_ocean.dest_op" => "destination_operator",
+            "kln_ocean.sales_rep" => "sales",
+            "kln_ocean.etd" => "etd",
+            "kln_ocean.eta" => "eta",
+            "kln_ocean.created_time" => "creation_time",
+            "kln_ocean.atd" => "atd",
+            "kln_ocean.ata" => "ata",
+            "kln_ocean.shipper_city" => "shipper_city",
+            "kln_ocean.consignee_city" => "consignee_city",
+            "kln_ocean.place_of_receipt_exp" => "place_of_receipt",
+            "kln_ocean.port_of_loading" => "port_of_loading",
+            "kln_ocean.port_of_discharge" => "port_of_discharge",
+            "kln_ocean.fport_of_loading_un" => "pol_locode",
+            "kln_ocean.mport_of_discharge_un" => "pod_locode",
+            "kln_ocean.place_of_delivery_exp" => "place_of_delivery",
+            "kln_ocean.port_of_transshipment_name" => "port_of_transhipment",
+            "kln_ocean.carrier" => "carrier",
             "(CASE
-                WHEN oo.voyage IS NOT DISTINCT FROM oo.f_voyage THEN oo.voyage
-                WHEN NULLIF(TRIM(oo.voyage), '') IS NOT NULL AND NULLIF(TRIM(oo.f_voyage), '') IS NOT NULL
-                    THEN oo.f_voyage || '/' || oo.voyage
-                WHEN NULLIF(TRIM(oo.voyage), '') IS NOT NULL
-                    THEN oo.voyage
-                ELSE oo.f_voyage
+                WHEN kln_ocean.voyage IS NOT DISTINCT FROM kln_ocean.f_voyage THEN kln_ocean.voyage
+                WHEN NULLIF(TRIM(kln_ocean.voyage), '') IS NOT NULL AND NULLIF(TRIM(kln_ocean.f_voyage), '') IS NOT NULL
+                    THEN kln_ocean.f_voyage || '/' || kln_ocean.voyage
+                WHEN NULLIF(TRIM(kln_ocean.voyage), '') IS NOT NULL
+                    THEN kln_ocean.voyage
+                ELSE kln_ocean.f_voyage
             END)"=>"voyage_flight",    
             "(CASE
-                WHEN oo.vessel IS NOT DISTINCT FROM oo.f_vessel THEN oo.vessel
-                WHEN NULLIF(TRIM(oo.vessel), '') IS NOT NULL AND NULLIF(TRIM(oo.f_vessel), '') IS NOT NULL
-                    THEN oo.f_vessel || '/' || oo.vessel
-                WHEN NULLIF(TRIM(oo.vessel), '') IS NOT NULL
-                    THEN oo.vessel
-                ELSE oo.f_vessel
+                WHEN kln_ocean.vessel IS NOT DISTINCT FROM kln_ocean.f_vessel THEN kln_ocean.vessel
+                WHEN NULLIF(TRIM(kln_ocean.vessel), '') IS NOT NULL AND NULLIF(TRIM(kln_ocean.f_vessel), '') IS NOT NULL
+                    THEN kln_ocean.f_vessel || '/' || kln_ocean.vessel
+                WHEN NULLIF(TRIM(kln_ocean.vessel), '') IS NOT NULL
+                    THEN kln_ocean.vessel
+                ELSE kln_ocean.f_vessel
             END)"=>"vessel_airline",
             "CONCAT_WS('/', 
                 CASE
-                    WHEN oo.vessel IS NOT DISTINCT FROM oo.f_vessel THEN oo.vessel
-                    WHEN NULLIF(TRIM(oo.vessel), '') IS NOT NULL AND NULLIF(TRIM(oo.f_vessel), '') IS NOT NULL
-                        THEN oo.f_vessel || '/' || oo.vessel
-                    WHEN NULLIF(TRIM(oo.vessel), '') IS NOT NULL
-                        THEN oo.vessel
-                    ELSE oo.f_vessel
+                    WHEN kln_ocean.vessel IS NOT DISTINCT FROM kln_ocean.f_vessel THEN kln_ocean.vessel
+                    WHEN NULLIF(TRIM(kln_ocean.vessel), '') IS NOT NULL AND NULLIF(TRIM(kln_ocean.f_vessel), '') IS NOT NULL
+                        THEN kln_ocean.f_vessel || '/' || kln_ocean.vessel
+                    WHEN NULLIF(TRIM(kln_ocean.vessel), '') IS NOT NULL
+                        THEN kln_ocean.vessel
+                    ELSE kln_ocean.f_vessel
                 END, 
                 CASE
-                    WHEN oo.voyage IS NOT DISTINCT FROM oo.f_voyage THEN oo.voyage
-                    WHEN NULLIF(TRIM(oo.voyage), '') IS NOT NULL AND NULLIF(TRIM(oo.f_voyage), '') IS NOT NULL
-                        THEN oo.f_voyage || '/' || oo.voyage
-                    WHEN NULLIF(TRIM(oo.voyage), '') IS NOT NULL
-                        THEN oo.voyage
-                    ELSE oo.f_voyage
+                    WHEN kln_ocean.voyage IS NOT DISTINCT FROM kln_ocean.f_voyage THEN kln_ocean.voyage
+                    WHEN NULLIF(TRIM(kln_ocean.voyage), '') IS NOT NULL AND NULLIF(TRIM(kln_ocean.f_voyage), '') IS NOT NULL
+                        THEN kln_ocean.f_voyage || '/' || kln_ocean.voyage
+                    WHEN NULLIF(TRIM(kln_ocean.voyage), '') IS NOT NULL
+                        THEN kln_ocean.voyage
+                    ELSE kln_ocean.f_voyage
                 END
             )"=>"vslvoy_flight",
-            "oo.ams_status" => "ace_m1_status",
-            "oo.isisf" => "is_isf",
-            "oo.obl_set" => "obl_set",
+            "kln_ocean.ams_status" => "ace_m1_status",
+            "kln_ocean.isisf" => "is_isf",
+            "kln_ocean.obl_set" => "obl_set",
             "oc.ctnr" => "container_no",
             "oc.size" => "container_size",
             "oc.qty" => "container_qty",