code

utils/common.class.php

@@ -4987,26 +4987,26 @@ class common {
         }
 
         $joinPublic = "
-            INNER JOIN public.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'public'";
+            LEFT JOIN public.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'public'";
 
         $joinSfs = "
-            INNER JOIN sfs.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'sfs'";
+            LEFT JOIN sfs.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'sfs'";
 
         // 公共部分：JOIN 容器和 item
         if ($needContainerData && $needItemData) {
             $joinPublic = "
-            INNER JOIN public.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'public'
+            LEFT JOIN public.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'public'
             LEFT JOIN public.oc_container_item oi ON oc.id = oi.oc_container_id";
 
             $joinSfs = "
-                INNER JOIN sfs.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'sfs'
+                LEFT JOIN sfs.oc_container oc ON oo.serial_no::text = oc.serial_no::text AND oo.order_from = 'sfs'
                 LEFT JOIN sfs.oc_container_item oi ON oc.id = oi.oc_container_id";
         }
 
         $sql .= ",
         vv_public AS (
             SELECT {$needCustomerSQL} {$needteuSQL}  1
-            FROM oo 
+            FROM (select * from oo where oo.order_from = 'public') as oo 
             {$joinPublic}
             {$oeLateral}
             {$co2Lateral}
@@ -5014,7 +5014,7 @@ class common {
         ),
         vv_sfs AS (
             SELECT {$needCustomerSQL} {$needteuSQL} 1
-            FROM oo 
+            FROM (select * from oo where oo.order_from = 'sfs') as oo 
             {$joinSfs}
             {$oeLateral}
             {$co2Lateral}