From eeb0d39b6e2152b16813b25d2e2a0c5333d0f928 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 19 八月 2025 17:09:16 +0800
Subject: [PATCH] 报工最后一道工序修改,添加对应语言

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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..52b7c6c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -452,13 +452,13 @@
                     )  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