From 3edf8c4fc07f9784e2d04ee7a98692bb457749eb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 16:28:10 +0800
Subject: [PATCH] feat(mes): 新增工艺路线完整导入功能并优化相关验证
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 410834a..2364935 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
@@ -7,12 +7,15 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderBomMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderProcessMapper;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -48,6 +51,10 @@
private MesProProcessService processService;
@Resource
private MesProRouteProcessService routeProcessService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
@Resource
@Lazy
private MesProWorkOrderBomService workOrderBomService;
@@ -89,6 +96,9 @@
.collect(Collectors.joining(",")));
}
workOrderProcessMapper.updateById(updateObj);
+ // 鎶ュ伐浠撳簱鍏佽缃┖锛屽崟鐙洿鏂�
+ workOrderProcessMapper.updateWarehouseById(updateReqVO.getId(), updateReqVO.getWarehouseId(),
+ updateReqVO.getLocationId(), updateReqVO.getAreaId());
// 3. 閲嶅缓宸ュ簭閾�
rebuildProcessChain(updateReqVO.getWorkOrderId());
@@ -122,6 +132,11 @@
}
@Override
+ public MesProWorkOrderProcessDO getWorkOrderProcessByWorkOrderIdAndProcessId(Long workOrderId, Long processId) {
+ return workOrderProcessMapper.selectByWorkOrderIdAndProcessId(workOrderId, processId);
+ }
+
+ @Override
public MesProWorkOrderProcessDO getLastWorkOrderProcessByWorkOrderId(Long workOrderId) {
return workOrderProcessMapper.selectLastByWorkOrderId(workOrderId);
}
@@ -146,12 +161,15 @@
if (CollUtil.isEmpty(routeProcessList)) {
return Collections.emptyList();
}
+ // 宸ヨ壓璺嚎浜у搧涓婇厤缃殑鎶ュ伐浠撳簱浣滀负宸ュ簭榛樿鍊硷紝涓嬪崟鏃跺彲鍐嶄慨鏀�
+ MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
// 杞崲涓哄伐鍗曞伐搴� DO锛堜笉璁剧疆 workOrderId锛屽墠绔繚瀛樻椂鍐嶈缃級
List<MesProWorkOrderProcessDO> processList = new ArrayList<>(routeProcessList.size());
for (MesProRouteProcessDO routeProcess : routeProcessList) {
processList.add(MesProWorkOrderProcessDO.builder()
.processId(routeProcess.getProcessId())
.paramTemplateId(routeProcess.getParamTemplateId())
+ .yieldRate(routeProcess.getYieldRate())
.sort(routeProcess.getSort())
.nextProcessId(routeProcess.getNextProcessId())
.linkType(routeProcess.getLinkType())
@@ -162,6 +180,9 @@
.checkFlag(routeProcess.getCheckFlag())
.backflushFlag(routeProcess.getBackflushFlag())
.outputItemId(routeProcess.getOutputItemId())
+ .warehouseId(routeProduct != null ? routeProduct.getWarehouseId() : null)
+ .locationId(routeProduct != null ? routeProduct.getLocationId() : null)
+ .areaId(routeProduct != null ? routeProduct.getAreaId() : null)
.remark(routeProcess.getRemark())
.build());
}
@@ -213,6 +234,9 @@
updateObj.setOutputItemId(item.getOutputItemIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
}
workOrderProcessMapper.updateById(updateObj);
+ // 鎶ュ伐浠撳簱鍏佽缃┖锛屽崟鐙洿鏂�
+ workOrderProcessMapper.updateWarehouseById(item.getId(), item.getWarehouseId(),
+ item.getLocationId(), item.getAreaId());
}
}
@@ -278,7 +302,12 @@
throw exception(PRO_WORK_ORDER_PROCESS_DUPLICATE);
}
}
- // 4. 鏍￠獙鍏抽敭宸ュ簭鍞竴
+ // 4. 鏍￠獙鎶ュ伐浠撳簱灞傜骇锛堜粨搴�/搴撳尯/搴撲綅鍚屾椂濉啓鏃舵牎楠屽綊灞炲叧绯伙級
+ if (reqVO.getWarehouseId() != null && reqVO.getLocationId() != null && reqVO.getAreaId() != null) {
+ warehouseAreaService.validateWarehouseAreaExists(reqVO.getWarehouseId(),
+ reqVO.getLocationId(), reqVO.getAreaId());
+ }
+ // 5. 鏍￠獙鍏抽敭宸ュ簭鍞竴
if (Boolean.TRUE.equals(reqVO.getKeyFlag())) {
for (MesProWorkOrderProcessDO process : list) {
if (reqVO.getId() != null && reqVO.getId().equals(process.getId())) {
--
Gitblit v1.9.3