From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
index d5089de..fc601cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.product.MesProRouteProductSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteProductMapper;
+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;
@@ -34,6 +35,10 @@
@Resource
@Lazy
private MesProRouteProductBomService routeProductBomService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService warehouseService;
@Override
public Long createRouteProduct(MesProRouteProductSaveReqVO createReqVO) {
@@ -41,6 +46,8 @@
routeService.validateRouteNotEnable(createReqVO.getRouteId());
// 1.1 鏍￠獙浜у搧鍞竴鎬э紙涓�涓骇鍝佸彧鑳藉叧鑱斾竴鏉″伐鑹鸿矾绾匡級
validateItemUnique(null, createReqVO.getItemId());
+ // 1.2 鏍￠獙鎶ュ伐鍏ュ簱涓夌骇锛堜粨搴� 鈫� 搴撳尯 鈫� 搴撲綅锛夌殑鐖跺瓙鍏崇郴
+ validateWarehouseChain(createReqVO);
// 2. 鎻掑叆
MesProRouteProductDO routeProduct = BeanUtils.toBean(createReqVO, MesProRouteProductDO.class);
@@ -56,6 +63,8 @@
validateRouteProductExists(updateReqVO.getId());
// 1.2 鏍￠獙浜у搧鍞竴鎬�
validateItemUnique(updateReqVO.getId(), updateReqVO.getItemId());
+ // 1.3 鏍￠獙鎶ュ伐鍏ュ簱涓夌骇鐨勭埗瀛愬叧绯�
+ validateWarehouseChain(updateReqVO);
// 2. 鏇存柊
MesProRouteProductDO updateObj = BeanUtils.toBean(updateReqVO, MesProRouteProductDO.class);
@@ -89,6 +98,22 @@
}
}
+ /**
+ * 鏍￠獙鎶ュ伐鍏ュ簱涓夌骇锛氫粨搴� 鈫� 搴撳尯 鈫� 搴撲綅 鐨勭埗瀛愬叧绯�
+ *
+ * <p>涓変釜閮藉～鏃舵墠鏍￠獙灞傜骇鏄惁鍖归厤锛岄伩鍏嶅墠绔仈鍔ㄩ敊浣嶆椂鎶婂簱浣嶆寕鍒板埆鐨勪粨搴撲笅銆�
+ * 鍏佽鍙～浠撳簱锛堥儴鍒嗗満鏅彧瑕佺煡閬撳叆鍝釜浠擄級锛屾墍浠ヤ笉鏄笁涓兘蹇呭～銆�</p>
+ */
+ private void validateWarehouseChain(MesProRouteProductSaveReqVO reqVO) {
+ // 1. 浠撳簱濉簡灏辨牎楠屽瓨鍦紙鍙～浠撳簱銆佷笉濉簱鍖哄簱浣嶆槸鍏佽鐨勶級
+ if (reqVO.getWarehouseId() != null) {
+ warehouseService.validateWarehouseExists(reqVO.getWarehouseId());
+ }
+ // 2. 搴撲綅濉簡灏辨牎楠屻�屽簱鍖衡啋搴撲綅銆嶃�屼粨搴撯啋搴撳尯銆嶇殑鐖跺瓙鍏崇郴鏄惁涓蹭簡
+ warehouseAreaService.validateWarehouseAreaExists(
+ reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
+ }
+
private void validateItemUnique(Long id, Long itemId) {
MesProRouteProductDO existing = routeProductMapper.selectByItemId(itemId);
if (existing == null) {
--
Gitblit v1.9.3