From 07d08f8dc420ba47f66587fdc5038a59fc340c96 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 29 八月 2024 10:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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..ae4206b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -77,6 +77,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 o.create_order>0
and od.create_time between #{selectTime1} and #{selectTime2}
and position(#{processes} in ps.processes)
and position(#{orderIds} in ps.order_id)
@@ -140,7 +141,7 @@
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
and od.create_time 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 != ''">
@@ -236,7 +237,7 @@
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
and od.create_time 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 != ''">
@@ -269,6 +270,7 @@
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 position(#{processes} in ps.processes)
and position(#{orderId} in ps.order_id)
<if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
--
Gitblit v1.8.0