From 27768d84cdec849c78dbda07ec78be4413508e3b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 三月 2025 10:22:55 +0800
Subject: [PATCH] 发货新增计算方式

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 23aecd1..8c36f08 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -868,7 +868,7 @@
                  left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
         where   d.create_time >= #{selectTime1}
           AND d.create_time &lt;  #{selectTime2}
-          and o.create_order>0
+          and d.create_order>0
           and reportWorkQuantity is not null
         GROUP BY a.order_id
         ORDER BY a.order_id
@@ -999,8 +999,8 @@
                  LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
             AND dd.order_number = ogd.order_number
             AND dd.technology_number = ogd.technology_number
-        WHERE date(rw.reporting_work_time) >= #{dates[0]}
-          and date(rw.reporting_work_time) &lt;= #{dates[1]}
+        WHERE rw.reporting_work_time >= #{dates[0]}
+          and rw.reporting_work_time &lt;= #{dates[1]}
           AND dd.available = 0
         GROUP BY dd.id
     </select>
@@ -1978,7 +1978,7 @@
         WHERE
             rw.reporting_work_time >= #{selectTime1}
           AND rw.reporting_work_time &lt;  #{selectTime2}
-          AND dd.available = 0;
+          AND dd.available = 0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}
         </if>

--
Gitblit v1.8.0