From 33ef2b3bd1e97e392605ff4ca9a1b01f931cf447 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 12 二月 2025 15:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 146e063..04754d7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -203,7 +203,7 @@
on e.process_id = c.process_id
and e.technology_number = c.technology_number
and e.order_number = c.order_number
- where a.order_id = #{orderId}
+ where a.order_id = #{orderId} and d.create_order>0
group by c.order_number,
c.technology_number,
c.process_id
@@ -238,6 +238,7 @@
and dd.available = 0
and reviewed_state != 2
and rw.this_process != dd.responsible_process
+ and o.create_order>0
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
</if>
@@ -384,7 +385,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -465,7 +466,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -535,7 +536,7 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpd.process = #{selectProcesses}
and o.create_time >= #{selectTime1}
AND o.create_time < #{selectTime2}
@@ -578,7 +579,6 @@
AND rw.reporting_work_time < #{selectTime2}
AND dd.available = 0
- AND LENGTH( rw.process_id )= 14
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -612,6 +612,9 @@
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
and ogd.glass_child regexp #{damageReportDTO.glassChild}
</if>
+ <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ </if>
GROUP BY
dd.id
limit #{offset},#{pageSize};
@@ -632,7 +635,6 @@
rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
AND dd.available = 0
- AND LENGTH( rw.process_id )= 14
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -726,7 +728,7 @@
AND opd.technology_number = fc.technology_number
WHERE DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
-
+ and o.create_order>0
GROUP BY o.order_id,
fc.order_number,
fc.technology_number
@@ -756,6 +758,7 @@
AND opd.order_number = fc.order_number
AND opd.technology_number = fc.technology_number
WHERE opd.reporting_work_num > 0
+ and o.create_order>0
and DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
AND position(#{selectProcesses} IN opd.process)
GROUP BY opd.process, o.order_id
@@ -810,7 +813,7 @@
and e.order_number=c.order_number
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where a.order_id = #{orderId}
+ where a.order_id = #{orderId} and d.create_order>0
group by c.order_number,c.technology_number
ORDER BY a.order_number
</select>
@@ -860,6 +863,7 @@
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
where d.create_time >= #{selectTime1}
AND d.create_time < #{selectTime2}
+ and o.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -903,6 +907,7 @@
AND rw.process_id = fc.process_id
WHERE o.create_time >= #{selectTime1}
AND o.create_time < #{selectTime2}
+ and o.create_order>0
AND fc.create_time IS NOT NULL
GROUP BY o.order_id
</select>
@@ -982,7 +987,6 @@
WHERE date(rw.reporting_work_time) >= #{dates[0]}
and date(rw.reporting_work_time) <= #{dates[1]}
AND dd.available = 0
- AND LENGTH(rw.process_id) = 14
GROUP BY dd.id
</select>
@@ -1025,6 +1029,7 @@
AND rw.process_id = fc.process_id
WHERE date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and o.create_order>0
AND fc.create_time IS NOT NULL
GROUP BY o.order_id
</select>
@@ -1069,7 +1074,7 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpd.process = #{process}
and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
@@ -1137,7 +1142,7 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{process}
@@ -1194,6 +1199,7 @@
where d.create_time
and date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and d.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -1254,6 +1260,7 @@
WHERE date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and o.create_order>0
GROUP BY o.order_id,
fc.order_number,
fc.technology_number
@@ -1285,6 +1292,7 @@
WHERE opd.reporting_work_num > 0
and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
+ and o.create_order>0
AND position(#{process} IN opd.process)
GROUP BY opd.process, o.order_id
</select>
@@ -1504,7 +1512,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1573,7 +1581,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1653,7 +1661,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1725,7 +1733,7 @@
GROUP BY a.process_id,a.teams_groups_name,a.next_process,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 and rws.next_process=#{selectProcesses}
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1762,7 +1770,7 @@
where processes = #{processes}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{processes}
+ where ps.processes = #{processes} and o.create_order>0
and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
<if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
@@ -1788,7 +1796,7 @@
where processes = #{processes}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{processes}
+ where ps.processes = #{processes} and o.create_order>0
and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
<if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
@@ -1818,7 +1826,7 @@
where processes = #{process}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{process}
+ where ps.processes = #{process} and o.create_order>0
and date(scheduled_start_time) >= #{date[0]}
and date(scheduled_start_time) <= #{date[1]}
GROUP BY ps.order_id, ps.processes
--
Gitblit v1.8.0