From 5c4c7dd0c4cd462bee347c7c807d51675049918a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 四月 2024 14:25:58 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml | 6 +++---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 +++---
2 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 9689a44..3f27159 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -310,7 +310,7 @@
</select>
<select id="selectGlassProcessNum" resultType="java.lang.Integer">
select
- d.reporting_work_num-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ d.reporting_work_num_count-b.reporting_work_num_count-b.broken_num+ifnull(c.patchNumSum,0)
from flow_card as a
left join sd.order_process_detail as b
on
@@ -321,8 +321,8 @@
and b.process_id = a.process_id
left join sd.order_process_detail as d
on d.id=b.id-1
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
+ left join (select sum(rework_num) as patchNumSum,order_sort,technology_number,process_id
+ from rework
group by reporting_work_id,order_sort,technology_number) as c
on
c.process_id = a.process_id
diff --git a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml b/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
index 9689a44..3f27159 100644
--- a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
@@ -310,7 +310,7 @@
</select>
<select id="selectGlassProcessNum" resultType="java.lang.Integer">
select
- d.reporting_work_num-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ d.reporting_work_num_count-b.reporting_work_num_count-b.broken_num+ifnull(c.patchNumSum,0)
from flow_card as a
left join sd.order_process_detail as b
on
@@ -321,8 +321,8 @@
and b.process_id = a.process_id
left join sd.order_process_detail as d
on d.id=b.id-1
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
+ left join (select sum(rework_num) as patchNumSum,order_sort,technology_number,process_id
+ from rework
group by reporting_work_id,order_sort,technology_number) as c
on
c.process_id = a.process_id
--
Gitblit v1.8.0