From 3c1b9fb8df75485b832a54cfd5aa8cb4997ed4a1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 08 一月 2025 09:10:05 +0800
Subject: [PATCH] app相关接口

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

diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 3a7c802..4f8c382 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -213,7 +213,7 @@
         LEFT JOIN sd.order_glass_detail AS ogd
                 ON od.order_id = ogd.order_id
                 AND od.order_number = ogd.order_number
-        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
             AND ogd.`group` = (select `group`
                                from sd.order_glass_detail
                                where order_id = ogd.order_id
@@ -343,10 +343,10 @@
     </select>
     <select id="selectGlassProcessNum" resultType="java.lang.Integer">
         select
-        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
+        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
            0,
            (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
-            )
+            ),0)
         from flow_card as a
         left join sd.order_process_detail as b
         on
@@ -943,7 +943,7 @@
         LEFT JOIN sd.order_glass_detail AS ogd
         ON od.order_id = ogd.order_id
         AND od.order_number = ogd.order_number
-        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
             AND ogd.`group` = (select `group`
             from sd.order_glass_detail
             where order_id = ogd.order_id

--
Gitblit v1.8.0