From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 3459587..a8b9d56 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -77,7 +77,8 @@
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 o.create_order>0
+ 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 != ''">
@@ -138,9 +139,9 @@
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)
-- and position("鍒囧壊" in ps.processes)
<if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
@@ -234,9 +235,9 @@
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)
-- and position("鍒囧壊" in ps.processes)
<if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
@@ -268,7 +269,8 @@
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)
<if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
--
Gitblit v1.8.0