From b2cefd84dfd1aa051ae4ab342874fbafef74ab3b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 13:19:59 +0800
Subject: [PATCH] 修改补片打印筛选

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 f8bac5c..36377c4 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -448,17 +448,17 @@
                    a.completed_quantity,
                 (a.completed_quantity+ a.breakage_quantity),
                    (f.completed_quantity
-                       -ifnull(g.completed_quantity,0))
+                       -ifnull(g.completed_quantity,0) + a.breakage_quantity)
                     )  as minQuantity -- 淇敼鏈�灏忔暟
             </if>
             <if test="nextProcess == null or nextProcess == ''">  -- 鏈�鍚庝竴閬撳伐搴�
-#               c.received_quantity, -- 宸插叆搴撴暟閲�
-#               c.inventory_quantity, --   搴撳瓨鏁伴噺
+               c.received_quantity, -- 宸插叆搴撴暟閲�
+               c.inventory_quantity, --   搴撳瓨鏁伴噺
               if(ifnull(inventory_quantity,0)
                  -ifnull(c.received_quantity,0)
-                 &gt;= a.completed_quantity,0,
-                (a.completed_quantity-(ifnull(c.inventory_quantity,0)
-                    -ifnull(c.received_quantity,0)))
+                 &gt;= a.completed_quantity,a.completed_quantity,
+                (ifnull(c.inventory_quantity,0)
+                -ifnull(c.received_quantity,0))
                 )
                 as minQuantity -- 淇敼鏈�灏忔暟
             </if>

--
Gitblit v1.8.0