From d873cbc55704ed517607227d9d010204da3f1888 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 七月 2024 13:43:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml |    7 +++++--
 1 files changed, 5 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..17de88e 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>
 

--
Gitblit v1.8.0