From 72c42057992d79a40a8ed790d5329c2f463e34c1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 20 四月 2026 17:52:01 +0800
Subject: [PATCH] refactor(technology): 优化工艺路线服务实现并修复附件过滤逻辑
---
src/main/java/com/ruoyi/technology/service/TechnologyRoutingService.java | 19 +++++++++
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 11 +++--
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 71 +++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 18 ++++++++-
4 files changed, 111 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index 8c30cb3..54dbd90 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -132,7 +133,7 @@
if(commonFiles == null){
commonFiles = new ArrayList<>();
}
- List<CommonFile> finalCommonFiles = commonFiles;
+ AtomicReference<List<CommonFile>> finalCommonFiles = new AtomicReference<>(commonFiles);
List<InspectionTaskDto> dtoList = entityPage.getRecords().stream().map(inspectionTask -> {
InspectionTaskDto dto = new InspectionTaskDto();
@@ -160,11 +161,11 @@
}
dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-
+ finalCommonFiles.set(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getCommonId().equals(inspectionTask.getId())).collect(Collectors.toList()));
// 鍒濆鍖栦笁涓檮浠跺垪琛�
- dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList()));
+ dto.setCommonFileList(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList()));
+ dto.setCommonFileListAfter(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList()));
+ dto.setCommonFileListBefore(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList()));
return dto;
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index e73812a..e98d216 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -12,7 +12,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
@RestController
@@ -23,30 +22,45 @@
private final TechnologyRoutingService technologyRoutingService;
+ /**
+ * 鍒嗛〉鏌ヨ宸ヨ壓璺嚎銆�
+ */
@GetMapping("/page")
@ApiOperation("宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
public R<IPage<TechnologyRoutingVo>> page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRoutingDto));
}
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎璇︽儏銆�
+ */
@GetMapping("/{id}")
@ApiOperation("宸ヨ壓璺嚎璇︽儏")
public R<TechnologyRoutingVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingService.getTechnologyRoutingInfo(id));
}
+ /**
+ * 鏂板宸ヨ壓璺嚎銆�
+ */
@PostMapping
@ApiOperation("鏂板宸ヨ壓璺嚎")
public R add(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
}
+ /**
+ * 淇敼宸ヨ壓璺嚎銆�
+ */
@PutMapping
@ApiOperation("淇敼宸ヨ壓璺嚎")
public R edit(@RequestBody TechnologyRouting technologyRouting) {
- return R.ok(technologyRoutingService.updateById(technologyRouting));
+ return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
}
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎銆�
+ */
@DeleteMapping("/delete")
@ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
public R remove(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/technology/service/TechnologyRoutingService.java b/src/main/java/com/ruoyi/technology/service/TechnologyRoutingService.java
index 468ebd8..fc44450 100644
--- a/src/main/java/com/ruoyi/technology/service/TechnologyRoutingService.java
+++ b/src/main/java/com/ruoyi/technology/service/TechnologyRoutingService.java
@@ -11,11 +11,30 @@
public interface TechnologyRoutingService extends IService<TechnologyRouting> {
+ /**
+ * 宸ヨ壓璺嚎鍒嗛〉鏌ヨ锛屾煡璇㈠弬鏁颁娇鐢� DTO锛岃繑鍥炴暟鎹娇鐢� VO銆�
+ */
IPage<TechnologyRoutingVo> pageTechnologyRouting(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto);
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎璇︽儏銆�
+ */
TechnologyRoutingVo getTechnologyRoutingInfo(Long id);
+ /**
+ * 鏂板宸ヨ壓璺嚎銆�
+ * 閫夋嫨浜� BOM 鏃讹紝浼氳嚜鍔ㄦ妸 BOM 涓厤缃殑宸ュ簭鍚屾鍒板伐鑹鸿矾绾垮伐搴忚〃銆�
+ */
Long saveTechnologyRouting(TechnologyRouting technologyRouting);
+ /**
+ * 淇敼宸ヨ壓璺嚎銆�
+ * 褰� BOM 鍙戠敓鍙樺寲鏃讹紝浼氶噸鏂板悓姝ュ伐鑹鸿矾绾垮伐搴忚〃銆�
+ */
+ boolean updateTechnologyRouting(TechnologyRouting technologyRouting);
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎锛屽苟绾ц仈鍒犻櫎宸ヨ壓璺嚎宸ュ簭銆�
+ */
boolean removeTechnologyRouting(List<Long> ids);
}
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 f94f363..62b74e6 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -9,8 +9,12 @@
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
+import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
+import com.ruoyi.technology.mapper.TechnologyOperationMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;
+import com.ruoyi.technology.pojo.TechnologyBomStructure;
+import com.ruoyi.technology.pojo.TechnologyOperation;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingService;
@@ -20,7 +24,9 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
@Service
@Transactional(rollbackFor = Exception.class)
@@ -30,6 +36,10 @@
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
+
+ private final TechnologyBomStructureMapper technologyBomStructureMapper;
+
+ private final TechnologyOperationMapper technologyOperationMapper;
@Override
public IPage<TechnologyRoutingVo> pageTechnologyRouting(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
@@ -57,8 +67,19 @@
public Long saveTechnologyRouting(TechnologyRouting technologyRouting) {
String code = OrderUtils.countTodayByCreateTime(technologyRoutingMapper, "GYLX", "process_route_code");
technologyRouting.setProcessRouteCode(code);
- this.save(technologyRouting);
+ // 甯﹀叆bom浜у搧缁撴瀯
+ syncRoutingOperationsByBom(technologyRouting);
return technologyRouting.getId();
+ }
+
+ @Override
+ public boolean updateTechnologyRouting(TechnologyRouting technologyRouting) {
+ boolean updated = this.updateById(technologyRouting);
+ if (updated) {
+ TechnologyRouting currentRouting = this.getById(technologyRouting.getId());
+ syncRoutingOperationsByBom(currentRouting);
+ }
+ return updated;
}
@Override
@@ -71,6 +92,54 @@
return this.removeByIds(ids);
}
+ /**
+ * 鎸夊綋鍓嶉�夋嫨鐨� BOM 閲嶅缓宸ヨ壓璺嚎宸ュ簭锛�
+ * 1. 鍏堝垹闄よ宸ヨ壓璺嚎涓嬪凡鏈夊伐搴�
+ * 2. 璇诲彇 BOM 缁撴瀯涓殑 operation_id
+ * 3. 鎸� BOM 鍑虹幇椤哄簭鍘婚噸鍚庨噸鏂板啓鍏ュ伐鑹鸿矾绾垮伐搴忚〃
+ */
+ private void syncRoutingOperationsByBom(TechnologyRouting technologyRouting) {
+ technologyRoutingOperationMapper.delete(Wrappers.<TechnologyRoutingOperation>lambdaQuery()
+ .eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId()));
+ if (technologyRouting.getBomId() == null) {
+ return;
+ }
+ List<TechnologyBomStructure> bomStructures = technologyBomStructureMapper.selectList(
+ Wrappers.<TechnologyBomStructure>lambdaQuery()
+ .eq(TechnologyBomStructure::getBomId, Long.valueOf(technologyRouting.getBomId()))
+ .isNotNull(TechnologyBomStructure::getOperationId)
+ .orderByAsc(TechnologyBomStructure::getId)
+ );
+ if (bomStructures.isEmpty()) {
+ return;
+ }
+
+ // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝杩欓噷鎸夐娆″嚭鐜伴『搴忓幓閲嶃��
+ Map<Long, TechnologyBomStructure> uniqueOperationMap = new LinkedHashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ uniqueOperationMap.putIfAbsent(bomStructure.getOperationId(), bomStructure);
+ }
+
+ int dragSort = 1;
+ for (TechnologyBomStructure bomStructure : uniqueOperationMap.values()) {
+ TechnologyRoutingOperation routingOperation = new TechnologyRoutingOperation();
+ routingOperation.setTechnologyRoutingId(technologyRouting.getId());
+ routingOperation.setProductModelId(technologyRouting.getProductModelId());
+ routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
+ routingOperation.setDragSort(dragSort++);
+ routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
+ technologyRoutingOperationMapper.insert(routingOperation);
+ }
+ }
+
+ /**
+ * 璐ㄦ鏍囪瘑浠ュ伐搴忓熀纭�琛ㄥ畾涔変负鍑嗐��
+ */
+ private Boolean getOperationQuality(Long operationId) {
+ TechnologyOperation technologyOperation = technologyOperationMapper.selectById(operationId);
+ return technologyOperation != null ? technologyOperation.getIsQuality() : null;
+ }
+
private String buildProcessRouteCode(Long id) {
String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String idStr = String.format("%06d", id);
--
Gitblit v1.9.3