From dce5f099e76ecfa92ad708a3d5565a67844ceda2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 二月 2025 12:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 18 +++++++++++++-----
1 files changed, 13 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 4f8c382..cf7f56e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -91,6 +91,7 @@
where fc.process_id = #{processIdStr}
and POSITION(fc.technology_number in #{technologyStr})
and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+ and o.create_order>0
GROUP BY fc.process_id
</select>
@@ -179,6 +180,7 @@
AND POSITION(fc.technology_number in #{technologyStr})
AND odpd.process = #{process}
and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+ and o.create_order>0
group by fc.order_number,
ogd.technology_number
order by fc.order_number
@@ -347,7 +349,7 @@
0,
(d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
),0)
- from flow_card as a
+ from pp.flow_card as a
left join sd.order_process_detail as b
on
b.order_number = a.order_number
@@ -362,9 +364,9 @@
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
from
- rework as rw
+ pp.rework as rw
LEFT JOIN
- reporting_work as rwk
+ pp.reporting_work as rwk
on rw.reporting_work_id =rwk.reporting_work_id
where rwk.this_process=#{thisProcess}
and rw.review_status=1
@@ -533,7 +535,8 @@
on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
rwd.technology_number = ogd.technology_number
where rw.reviewed_state != 2
- and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ and rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
and o.create_order>0
@@ -576,7 +579,8 @@
on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
rwd.technology_number = ogd.technology_number
where rw.reviewed_state != 2
- and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
+ and rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2} and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
and o.create_order>0
<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
@@ -1004,4 +1008,8 @@
<select id="getProcessLaminating">
select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
</select>
+
+ <select id="selectOrderid">
+ select order_id from pp.flow_card where process_id=#{processIdStr} group by order_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0