From fd89fbfa59d40f4016b43bcac8286bdcdb5e4df9 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 13:22:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 527db11..65888ab 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -89,7 +89,9 @@
 
             }
             //娣诲姞鐢熶骇璁㈠崟
-            workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
+            workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName,orderDetail.getOrderGlassDetail().getProcess());
+            //閬垮厤鍚屽簭鍙蜂笉鍚屽伐鑹轰慨鏀�
+            workOrderMapper.updateWorkIdMp(orderDetail.getOrderId(),userName);
             Integer state = 2;
             Integer states = 1;
             //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟

--
Gitblit v1.8.0