From d6db1b52d9ca9ee17fd5f28ad2b7ac9570f5a2a0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 21 五月 2025 16:56:12 +0800
Subject: [PATCH] 提交扫码枪相关程序
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 554d133..05acad1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -215,7 +215,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 == '鎵撹兌鍜岀矘妗�')" >
+ <if test="laminating == 'stepA'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -258,7 +258,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 process_id= #{processIdStr} and a.reviewed_state>=0
- <if test="laminating != 'laminating'">
+ <if test="laminating == ''">
AND POSITION(b.technology_number in #{technologyStr})
</if>
GROUP BY b.order_number,b.technology_number
@@ -268,7 +268,7 @@
fc.process_id = #{processIdStr}
AND odpd.process = #{process}
- <if test="laminating != 'laminating'">
+ <if test="laminating == ''">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
order by fc.order_number
@@ -952,7 +952,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 == '鎵撹兌鍜岀矘妗�')">
+ <if test="laminating == 'stepA'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -1002,7 +1002,7 @@
on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
WHERE
fc.process_id = #{processIdStr}
- <if test="laminating != 'laminating' ">
+ <if test="laminating == ''">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
@@ -1023,7 +1023,9 @@
SUM(rwd.completed_quantity) AS thisCompletedQuantity,
ROUND(SUM(ogd.child_width * ogd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
SUM(rwd.breakage_quantity) AS thisWornQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea
+ ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
+ CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
+ count(distinct rw.reporting_work_id) as 'total'
FROM reporting_work AS rw
LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
@@ -1060,7 +1062,6 @@
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
</if>
-
</select>
<select id="selectReviewedState">
--
Gitblit v1.8.0