From 6690f4754d433b9cde475868034b6d1a3c11d396 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 14:12:44 +0800
Subject: [PATCH] feat(ProductionPrintOrder) 工序添加是否质检
---
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
index 18868b3..a859165 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductBomService;
import com.ruoyi.production.service.ProductProcessRouteService;
+import com.ruoyi.production.service.ProductProcessService;
import com.ruoyi.production.service.ProductionPrintOrderService;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.Nullable;
@@ -29,6 +30,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,9 +53,13 @@
private final ProductBomService productBomService;
private final CustomerFollowUpFileService customerFollowUpFileService;
+ private final ProductProcessMapper productProcessMapper;
+ private final ProductProcessService productProcessService;
+
@Override
@Transactional
public void save(SaveProductionPrintOrderDto dto) {
+ Assert.isFalse(CollUtil.isEmpty(dto.getProcessContent()),"鎯呰嚦灏戞坊鍔犱竴鏉″伐搴忎俊鎭�");
ProductionPrintOrder productionPrintOrder = BeanUtil.copyProperties(dto, ProductionPrintOrder.class);
if(dto.getProductOrderId() != null){
// 鍏堝垹闄ょ敓浜у伐鍗曟暟鎹�
@@ -79,6 +85,9 @@
});
MaterialInfoDto materialInfoDtoFirst = dto.getMaterialInfo().get(0);
// 璋冪敤宸ュ簭鏂瑰 鍑芥暟
+ // 鏌ヨ宸ュ簭淇℃伅
+ List<Long> processIds = dto.getProcessContent().stream().map(ProcessContentDto::getProcessId).collect(Collectors.toList());
+ Map<Long, ProductProcess> productProcessMap = productProcessService.listByIds(processIds).stream().collect(Collectors.toMap(ProductProcess::getId, productProcess -> productProcess));
List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos = processContentDtoList.stream().map(it -> {
ProcessRouteAnticlockwiseDto pdto = new ProcessRouteAnticlockwiseDto();
pdto.setProcessId(it.getProcessId());
@@ -92,6 +101,7 @@
pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
pdto.setDeviceId(it.getDeviceId());
pdto.setUuid(it.getId());
+ pdto.setProductProcess(productProcessMap.get(it.getProcessId()));
return pdto;
}).collect(Collectors.toList());
--
Gitblit v1.9.3