From e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 15:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 4f54bdf..9c40694 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -163,7 +163,7 @@
processRoute.setDescription("");
this.save(processRoute);
- processRoute.setProcessRouteCode("GYLX." + String.format("%05d", processRoute.getId()));
+ processRoute.setProcessRouteCode("GYLX." + String.format("%09d", processRoute.getId()));
this.updateById(processRoute);
return processRoute;
@@ -215,11 +215,7 @@
ProductProcessRouteItem item = new ProductProcessRouteItem();
item.setProductRouteId(productRouteId);
item.setProcessId(dto.getProcessId());
- if (num >= dtos.size() - 1) {
- item.setProductModelId(productModelId);
- } else {
- item.setProductModelId(dto.getProductModelId());
- }
+ item.setProductModelId(productModelId);
item.setProcessRouteName(dto.getProcessRouteName());
item.setProcessRouteOpenNum(dto.getProcessRouteOpenNum());
item.setProcessRouteNum(dto.getProcessRouteNum());
--
Gitblit v1.9.3