From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 17de88e..a8b9d56 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -8,7 +8,7 @@
<result column="scheduling_quantity" property="schedulingQuantity"/>
<result column="order_number" property="orderNumber"/>
<result column="scheduling_id" property="schedulingId"/>
- <result column="order_id" property="orderGlassDetail.orderId"/>
+ <result column="order_id" property="order.orderId"/>
<result column="technology_number" property="technologyNumber"/>
<result column="pendingProductionQuantity" property="pendingProductionQuantity"/>
<result column="pendingProductionArea" property="pendingProductionArea"/>
@@ -77,11 +77,12 @@
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.orderId != null and productionScheduling.orderId != ''">
- and ogd.order_id regexp #{productionScheduling.orderId}
+ <if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.order.orderId}
</if>
<if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
and o.customer_name regexp #{productionScheduling.order.customerName}
@@ -138,13 +139,13 @@
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.orderId != null and productionScheduling.orderId != ''">
- and ogd.order_id regexp #{productionScheduling.orderId}
+ <if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.order.orderId}
</if>
<if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
and o.customer_name regexp #{productionScheduling.order.customerName}
@@ -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 != ''">
@@ -289,4 +291,8 @@
order by ps.id desc
limit #{offset},#{pageSize};
</select>
+
+ <update id="cancelReviewSchedulingMp">
+ update production_scheduling set review_status=0 where scheduling_id = #{schedulingId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0