From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 12 ++++++------
1 files changed, 6 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..fe197f0 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -52,6 +52,8 @@
private ProductOrderService productOrderService;
@Autowired
private ProductProcessService productProcessService;
+ @Autowired
+ private ProductionProductMainService productionProductMainService;
@Override
public IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
@@ -114,6 +116,8 @@
// 6. 鏂板鐢熶骇宸ヨ壓璺嚎瀛愯〃
buildProductProcessRouteItems(processRouteAnticlockwiseDtos, productProcessRoute.getId(), productModelId, productOrderId);
+ // 鎺掍骇涓嬭揪鍚庤嚜鍔ㄨЕ鍙戠涓�閬撻渶璐ㄦ宸ュ簭鐨勮繃绋嬫楠�
+ productionProductMainService.preGenerateQualityInspectForOrder(productOrderId);
return processRoute.getId();
}
@@ -163,7 +167,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 +219,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