From 8b116fd4f2633194b050a0eca13964ce4f2e18f7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 八月 2025 16:41:22 +0800
Subject: [PATCH] 订单转生产订单根据工艺流程区分不同产品，报工修改逻辑调整
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
index ae4206b..a8b9d56 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -78,7 +78,7 @@
ogd.technology_number=ps.technology_number
where ps.scheduling_id IS NOT NULL
and o.create_order>0
- and od.create_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((od.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and position(#{processes} in ps.processes)
and position(#{orderIds} in ps.order_id)
<if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
@@ -139,7 +139,7 @@
ps.technology_number = ogd.technology_number
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((od.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and opd.reporting_work_num_count = 0
and o.create_order>0
and position(#{orderIds} in ogd.order_id)
@@ -235,7 +235,7 @@
ps.technology_number = ogd.technology_number
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((od.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and opd.reporting_work_num_count = 0
and o.create_order>0
and position(#{orderId} in ogd.order_id)
@@ -269,7 +269,7 @@
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number and
ogd.technology_number=ps.technology_number
where ps.scheduling_id IS NOT NULL
- and od.create_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((od.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and o.create_order>0
and position(#{processes} in ps.processes)
and position(#{orderId} in ps.order_id)
--
Gitblit v1.8.0