From 67ed34527e4d6c79d9ce43bd5b59cdba6862fad8 Mon Sep 17 00:00:00 2001
From: "gary_chen\\gary_chen" <gary_chen@masada.com.tw>
Date: Fri, 3 Nov 2023 18:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=B1=E8=A1=A8=E4=BF=AE=E6=AD=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/estimated_shipping_date_report.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wms/estimated_shipping_date_report.php b/wms/estimated_shipping_date_report.php
index c08a0759..9872d265 100644
--- a/wms/estimated_shipping_date_report.php
+++ b/wms/estimated_shipping_date_report.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(0);
+// ini_set('display_errors', 'on');
 require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -22,12 +22,13 @@ $sql = "
         COUNT(this_order.sub_address) AS facility_count
     FROM(
         SELECT 
-            SUBSTR(w.address,1,2) AS sub_address,
+            SUBSTR(TRIM(w.address),1,2) AS sub_address,
             SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),1,4) AS date_year,
             SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),6,2) AS date_month,
             w.facility_kind,
             w.contract_type
         FROM wipwholestatus AS w
+        WHERE status = '1'
     ) AS this_order
     WHERE 1 = 1
     GROUP BY this_order.contract_type,
@@ -132,6 +133,7 @@ $sql = "
             w.facility_kind
         FROM wipwholestatus AS w
         WHERE 1=1
+        AND status = '1'
         AND real_contract_arrival_date >= '$start_y-$start_m-0'
         AND real_contract_arrival_date <= '$end_y-$end_m-0'
     ) AS new_order
@@ -172,6 +174,7 @@ $sql = "
         w.renovate_type
     FROM wipwholestatus AS w
     WHERE 1=1
+    AND status = '1'
     AND real_contract_arrival_date >= '$start_y-$start_m-0'
     AND real_contract_arrival_date <= '$end_y-$end_m-0'
     AND contract_type = 'B'