From cfa4a3fdb3dcd9a811157c4bd8f82ba4025917bc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 17 十二月 2024 08:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
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 4e7b451..75ffa13 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -430,11 +430,11 @@
ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
if((f.completed_quantity
-ifnull(g.completed_quantity,0))
- >=
+ >
a.completed_quantity,
0,
- (a.completed_quantity-f.completed_quantity
- +ifnull(g.completed_quantity,0))
+ (f.completed_quantity
+ -ifnull(g.completed_quantity,0))
) as minQuantity -- 淇敼鏈�灏忔暟
</if>
<if test="nextProcess == null or nextProcess == ''"> -- 鏈�鍚庝竴閬撳伐搴�
@@ -987,7 +987,7 @@
from reporting_work as a
left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
where this_process=#{previousProcess} and reviewed_state=0 and process_id= #{processIdStr}
- and POSITION(b.technology_number in #{technologyStr})
+
GROUP BY a.reporting_work_id,b.order_number,b.technology_number
) as rws
on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
--
Gitblit v1.8.0