From c78984f3aea4505971dc12f8acd41e30cf4fdbea Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 11:48:45 +0800
Subject: [PATCH] feat 质检检测调整

---
 src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index f3237b8..19da80f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -215,7 +215,11 @@
             ProductProcessRouteItem item = new ProductProcessRouteItem();
             item.setProductRouteId(productRouteId);
             item.setProcessId(dto.getProcessId());
-            item.setProductModelId(dto.getProductModelId());
+            if (num >= dtos.size()-1) {
+                item.setProductModelId(productModelId);
+            }else {
+                item.setProductModelId(dto.getProductModelId());
+            }
             item.setProcessRouteName(dto.getProcessRouteName());
             item.setProcessRouteOpenNum(dto.getProcessRouteOpenNum());
             item.setProcessRouteNum(dto.getProcessRouteNum());
@@ -233,7 +237,7 @@
             productWorkOrder.setDeviceId(dto.getDeviceId());
             productWorkOrder.setUserIds(dto.getUserIds());
             productWorkOrder.setUserNames(dto.getUserNames());
-            productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcess.getName(), byId.getNpsNo()));
+            productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder( productProcess.getName(), byId.getNpsNo()));
             productWorkOrder.setStatus(1);
             productWorkOrderService.save(productWorkOrder);
         }

--
Gitblit v1.9.3