From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
index e626b2e..073b4e6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
@@ -24,6 +24,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -31,7 +32,7 @@
/**
* MES 鐢熶骇宸ュ崟宸ュ簭 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -60,6 +61,12 @@
// 2. 鎻掑叆鏁版嵁
MesProWorkOrderProcessDO workOrderProcess = BeanUtils.toBean(createReqVO, MesProWorkOrderProcessDO.class);
+ if (CollUtil.isNotEmpty(createReqVO.getOutputItemIds())) {
+ workOrderProcess.setOutputItemId(
+ createReqVO.getOutputItemIds().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",")));
+ }
workOrderProcessMapper.insert(workOrderProcess);
// 3. 閲嶅缓宸ュ簭閾�
@@ -75,6 +82,12 @@
// 2. 鏇存柊鏁版嵁
MesProWorkOrderProcessDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkOrderProcessDO.class);
+ if (CollUtil.isNotEmpty(updateReqVO.getOutputItemIds())) {
+ updateObj.setOutputItemId(
+ updateReqVO.getOutputItemIds().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",")));
+ }
workOrderProcessMapper.updateById(updateObj);
// 3. 閲嶅缓宸ュ簭閾�
@@ -106,6 +119,19 @@
@Override
public List<MesProWorkOrderProcessDO> getWorkOrderProcessListByWorkOrderId(Long workOrderId) {
return workOrderProcessMapper.selectListByWorkOrderId(workOrderId);
+ }
+
+ @Override
+ public MesProWorkOrderProcessDO getLastWorkOrderProcessByWorkOrderId(Long workOrderId) {
+ return workOrderProcessMapper.selectLastByWorkOrderId(workOrderId);
+ }
+
+ @Override
+ public List<MesProWorkOrderProcessDO> getWorkOrderProcessListByWorkOrderIds(java.util.Collection<Long> workOrderIds) {
+ if (CollUtil.isEmpty(workOrderIds)) {
+ return Collections.emptyList();
+ }
+ return workOrderProcessMapper.selectListByWorkOrderIds(workOrderIds);
}
@Override
@@ -175,10 +201,16 @@
if (item.getId() == null) {
// 鏂板
MesProWorkOrderProcessDO process = BeanUtils.toBean(item, MesProWorkOrderProcessDO.class);
+ if (CollUtil.isNotEmpty(item.getOutputItemIds())) {
+ process.setOutputItemId(item.getOutputItemIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
+ }
workOrderProcessMapper.insert(process);
} else {
// 鏇存柊
MesProWorkOrderProcessDO updateObj = BeanUtils.toBean(item, MesProWorkOrderProcessDO.class);
+ if (CollUtil.isNotEmpty(item.getOutputItemIds())) {
+ updateObj.setOutputItemId(item.getOutputItemIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
+ }
workOrderProcessMapper.updateById(updateObj);
}
}
@@ -191,32 +223,27 @@
}
/**
- * 浠庡伐搴忓垪琛ㄤ腑鎻愬彇 BOM 鎶曟枡锛屽悎骞跺幓閲嶅悗淇濆瓨鍒板伐鍗� BOM 琛�
+ * 浠庡伐搴忓垪琛ㄤ腑鎻愬彇 BOM 鎶曟枡锛屾寜宸ュ簭鍒嗗埆淇濆瓨鍒板伐鍗� BOM 琛�
*/
private void saveWorkOrderBomFromProcesses(Long workOrderId, List<MesProWorkOrderProcessSaveReqVO> list) {
- // 鏀堕泦鎵�鏈夊伐搴忕殑 bomItems锛屾寜 itemId 鍘婚噸锛堜繚鐣欑涓�涓嚭鐜扮殑 quantity锛�
- java.util.Map<Long, MesProWorkOrderProcessSaveReqVO.BomItem> merged = new java.util.LinkedHashMap<>();
+ workOrderBomService.deleteWorkOrderBomByWorkOrderId(workOrderId);
+ List<MesProWorkOrderBomDO> bomList = new ArrayList<>();
for (MesProWorkOrderProcessSaveReqVO item : list) {
if (CollUtil.isNotEmpty(item.getBomItems())) {
for (MesProWorkOrderProcessSaveReqVO.BomItem bomItem : item.getBomItems()) {
if (bomItem.getItemId() != null) {
- merged.putIfAbsent(bomItem.getItemId(), bomItem);
+ bomList.add(MesProWorkOrderBomDO.builder()
+ .workOrderId(workOrderId)
+ .processId(item.getProcessId())
+ .itemId(bomItem.getItemId())
+ .quantity(bomItem.getQuantity())
+ .remark(bomItem.getRemark())
+ .build());
}
}
}
}
- // 鍒犻櫎鏃� BOM锛屾壒閲忔彃鍏ユ柊 BOM
- workOrderBomService.deleteWorkOrderBomByWorkOrderId(workOrderId);
- if (CollUtil.isNotEmpty(merged)) {
- List<MesProWorkOrderBomDO> bomList = new ArrayList<>(merged.size());
- for (MesProWorkOrderProcessSaveReqVO.BomItem bomItem : merged.values()) {
- bomList.add(MesProWorkOrderBomDO.builder()
- .workOrderId(workOrderId)
- .itemId(bomItem.getItemId())
- .quantity(bomItem.getQuantity())
- .remark(bomItem.getRemark())
- .build());
- }
+ if (CollUtil.isNotEmpty(bomList)) {
workOrderBomMapper.insertBatch(bomList);
}
}
--
Gitblit v1.9.3