From 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 10:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 11 +++++++++--
1 files changed, 9 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 fdd147d..d2b6019 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -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
@@ -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