From 93109c8a43cceb99ce39e1ccfdbd560ac2547422 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 14 一月 2025 08:34:52 +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 | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 2cb890c..146e063 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -537,7 +537,8 @@
on o.order_id = od.order_id
where LENGTH(fc.process_id) = 14
and odpd.process = #{selectProcesses}
- and DATE_FORMAT((o.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ and o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
and fc.quantity - odpd.reporting_work_num>0
@@ -573,7 +574,9 @@
AND dd.technology_number = ogd.technology_number
left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
- DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ 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 != ''">
@@ -626,7 +629,8 @@
AND dd.order_number = ogd.order_number
AND dd.technology_number = ogd.technology_number
WHERE
- DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ 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 != ''">
@@ -759,7 +763,7 @@
<select id="productionScheduleMp">
select a.order_number,
- if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+ if(a.shape='' || ISNULL(a.shape),'鏅舰',if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', ''))) as shape,
a.product_name,
b.child_width,
b.child_height,
@@ -848,12 +852,14 @@
) as reportWorkQuantityCount
FROM sd.order_process_detail as a
left join sd.`order` as o on o.order_id = a.order_id
- where DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ where o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
GROUP BY process_id, a.technology_number) as e
on e.process_id = c.process_id
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 DATE_FORMAT((d.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ where d.create_time >= #{selectTime1}
+ AND d.create_time < #{selectTime2}
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -882,18 +888,21 @@
FROM sd.`order` AS a
LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
WHERE b.this_process = '鍒囧壊'
- AND DATE_FORMAT((a.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ and a.create_time >= #{selectTime1}
+ AND a.create_time < #{selectTime2}
GROUP BY a.order_id) AS orw ON orw.order_id = o.order_id
LEFT JOIN (SELECT a.order_id,
SUM(b.reporting_work_num) AS completionsNum
FROM sd.`order` AS a
LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
WHERE b.process = '鍖呰'
- AND DATE_FORMAT((a.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ and a.create_time >= #{selectTime1}
+ AND a.create_time < #{selectTime2}
GROUP BY a.order_id) AS oopd ON oopd.order_id = o.order_id
LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
AND rw.process_id = fc.process_id
- WHERE DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ WHERE o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
AND fc.create_time IS NOT NULL
GROUP BY o.order_id
</select>
@@ -1302,7 +1311,8 @@
left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
left join sd.`order` as o on o.order_id=od.order_id
where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
- DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
@@ -1401,7 +1411,8 @@
left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
left join sd.`order` as o on o.order_id=od.order_id
where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
- DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
--
Gitblit v1.8.0