From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 fdd147d..3459587 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"/>
@@ -68,7 +68,8 @@
ps.reviewer,
od.product_name,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- ps.scheduling_id
+ ps.scheduling_id,
+ ps.notes
from sd.order_detail as od
left join sd.order as o on od.order_id = o.order_id
left join production_scheduling as ps
@@ -79,8 +80,8 @@
and od.create_time 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}
@@ -142,8 +143,8 @@
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}
@@ -195,7 +196,9 @@
<update id="examineSchedulingMp">
update production_scheduling
set review_status=1,
- reviewer=#{userName}
+ reviewer=#{userName},
+ scheduling_quantity=#{schedulingQuantity},
+ notes=#{notes}
where scheduling_id = #{schedulingId}
</update>
@@ -286,4 +289,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