From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
index 4079f84..0eff194 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -143,7 +143,10 @@
routingOperation.setProductModelId(resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId()));
routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
routingOperation.setDragSort(dragSort++);
- routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
+ TechnologyOperation technologyOperation = getOperation(bomStructure.getOperationId());
+ routingOperation.setIsQuality(technologyOperation != null ? technologyOperation.getIsQuality() : null);
+ routingOperation.setIsProduction(technologyOperation != null ? technologyOperation.getIsProduction() : null);
+ routingOperation.setType(technologyOperation != null ? technologyOperation.getType() : null);
technologyRoutingOperationMapper.insert(routingOperation);
syncRoutingOperationParams(routingOperation.getId(), bomStructure.getOperationId());
}
@@ -204,12 +207,11 @@
}
}
- /**
- * 璐ㄦ鏍囪瘑浠ュ伐搴忓熀纭�琛ㄥ畾涔変负鍑嗐��
- */
- private Boolean getOperationQuality(Long operationId) {
- TechnologyOperation technologyOperation = technologyOperationMapper.selectById(operationId);
- return technologyOperation != null ? technologyOperation.getIsQuality() : null;
+ private TechnologyOperation getOperation(Long operationId) {
+ if (operationId == null) {
+ return null;
+ }
+ return technologyOperationMapper.selectById(operationId);
}
private String buildProcessRouteCode(Long id) {
--
Gitblit v1.9.3