From 9efd8376cb0c444ce6f229b2544e68efa352f674 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 09:40:06 +0800
Subject: [PATCH] fix(mes): 工艺路线产品补齐报工入仓库/库区/库位,修复编辑不回显

---
 sql/mysql/route_product_warehouse_20261030.sql                                                                                    |   47 +++++++++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductSaveReqVO.java |    9 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductRespVO.java    |   18 ++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProductDO.java                     |   18 ++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java           |   25 ++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductServiceImpl.java                   |   25 ++++++++
 6 files changed, 142 insertions(+), 0 deletions(-)

diff --git a/sql/mysql/route_product_warehouse_20261030.sql b/sql/mysql/route_product_warehouse_20261030.sql
new file mode 100644
index 0000000..7ab6f33
--- /dev/null
+++ b/sql/mysql/route_product_warehouse_20261030.sql
@@ -0,0 +1,47 @@
+-- ============================================================
+-- 宸ヨ壓璺嚎浜у搧锛氳ˉ榻愩�屾姤宸ュ叆浠撳簱 / 鍏ュ簱搴撳尯 / 鍏ュ簱搴撲綅銆嶄笁鍒�
+-- 鐢熸垚鏃堕棿锛�2026-10-30
+--
+-- 闂锛氬墠绔伐鑹鸿矾绾夸骇鍝佽〃鍗曟棭宸插仛浜嗕笁绾ц仈鍔紙warehouseId 鈫� locationId 鈫� areaId锛夛紝
+--      鍒楄〃涔熷睍绀� warehouseName / locationName / areaName锛�
+--      浣嗘暟鎹簱琛ㄣ�丏O銆丼aveReqVO銆丷espVO 鍏ㄩ兘娌℃湁杩欎笁涓瓧娈碉紝
+--      瀵艰嚧锛�1) 缂栬緫鏃朵笅鎷夋涓嶅洖鏄�  2) 濉簡涔熷瓨涓嶈繘搴�  3) 鍒楄〃涓夊垪姘歌繙涓虹┖
+--
+-- 鍋氭硶锛氳ˉ涓夊垪锛屽叧鑱� MES 浠撳偍涓绘暟鎹�
+--      warehouse_id 鈫� mes_wm_warehouse.id       锛堟姤宸ュ叆浠撳簱锛�
+--      location_id  鈫� mes_wm_warehouse_location.id锛堝叆搴撳簱鍖猴級
+--      area_id      鈫� mes_wm_warehouse_area.id      锛堝叆搴撳簱浣嶏級
+--      灞傜骇鍏崇郴锛氫粨搴� 鈫� 搴撳尯 鈫� 搴撲綅锛屽簱鍖烘寕鍦ㄤ粨搴撲笅锛屽簱浣嶆寕鍦ㄥ簱鍖轰笅
+--
+-- 骞傜瓑锛氬厛鏌� information_schema 鍐� ALTER锛屽彲閲嶅鎵ц
+-- ============================================================
+
+DROP PROCEDURE IF EXISTS sp_route_product_add_col;
+DELIMITER $$
+CREATE PROCEDURE sp_route_product_add_col(IN p_col VARCHAR(64), IN p_comment VARCHAR(255), IN p_after VARCHAR(64))
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+                  WHERE table_schema = DATABASE() AND table_name = 'mes_pro_route_product' AND column_name = p_col) THEN
+    SET @s = CONCAT('ALTER TABLE `mes_pro_route_product` ADD COLUMN `', p_col, '` bigint NULL COMMENT ''', p_comment, ''' AFTER `', p_after, '`');
+    PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+                  WHERE table_schema = DATABASE() AND table_name = 'mes_pro_route_product' AND index_name = CONCAT('idx_', p_col)) THEN
+    SET @s2 = CONCAT('CREATE INDEX `idx_', p_col, '` ON `mes_pro_route_product` (`', p_col, '`)');
+    PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+  END IF;
+END$$
+DELIMITER ;
+
+CALL sp_route_product_add_col('warehouse_id', '鎶ュ伐鍏ヤ粨搴擄紙鍏宠仈 mes_wm_warehouse.id锛�', 'item_id');
+CALL sp_route_product_add_col('location_id', '鍏ュ簱搴撳尯锛堝叧鑱� mes_wm_warehouse_location.id锛�', 'warehouse_id');
+CALL sp_route_product_add_col('area_id', '鍏ュ簱搴撲綅锛堝叧鑱� mes_wm_warehouse_area.id锛�', 'location_id');
+
+DROP PROCEDURE IF EXISTS sp_route_product_add_col;
+
+-- ---------- 鏍¢獙 ----------
+SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_COMMENT
+  FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_route_product'
+   AND COLUMN_NAME IN ('warehouse_id','location_id','area_id')
+ ORDER BY ORDINAL_POSITION;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
index b0eaf5c..169604a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
@@ -10,9 +10,15 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
 import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,6 +48,12 @@
     private MesMdItemService itemService;
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesWmWarehouseService warehouseService;
+    @Resource
+    private MesWmWarehouseLocationService warehouseLocationService;
+    @Resource
+    private MesWmWarehouseAreaService warehouseAreaService;
 
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓宸ヨ壓璺嚎浜у搧")
@@ -96,6 +108,13 @@
                 convertSet(list, MesProRouteProductDO::getItemId));
         Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        // 鎶ュ伐鍏ュ簱涓夌骇鐨勫悕绉帮細浠撳簱 鈫� 搴撳尯 鈫� 搴撲綅
+        Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+                convertSet(list, MesProRouteProductDO::getWarehouseId));
+        Map<Long, MesWmWarehouseLocationDO> locationMap = warehouseLocationService.getWarehouseLocationMap(
+                convertSet(list, MesProRouteProductDO::getLocationId));
+        Map<Long, MesWmWarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(list, MesProRouteProductDO::getAreaId));
         // 2. 鎷兼帴 VO
         return BeanUtils.toBean(list, MesProRouteProductRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
@@ -104,6 +123,12 @@
                 MapUtils.findAndThen(unitMap, item.getUnitMeasureId(),
                         unit -> vo.setUnitName(unit.getName()));
             });
+            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),
+                    warehouse -> vo.setWarehouseName(warehouse.getName()));
+            MapUtils.findAndThen(locationMap, vo.getLocationId(),
+                    location -> vo.setLocationName(location.getName()));
+            MapUtils.findAndThen(areaMap, vo.getAreaId(),
+                    area -> vo.setAreaName(area.getName()));
         });
     }
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductRespVO.java
index 8df87e9..5d61b8d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductRespVO.java
@@ -25,6 +25,24 @@
     @Schema(description = "浜у搧鐗╂枡鍚嶇О")
     private String itemName;
 
+    @Schema(description = "鎶ュ伐鍏ヤ粨搴撶紪鍙�", example = "1")
+    private Long warehouseId;
+
+    @Schema(description = "鎶ュ伐鍏ヤ粨搴撳悕绉�")
+    private String warehouseName;
+
+    @Schema(description = "鍏ュ簱搴撳尯缂栧彿", example = "1")
+    private Long locationId;
+
+    @Schema(description = "鍏ュ簱搴撳尯鍚嶇О")
+    private String locationName;
+
+    @Schema(description = "鍏ュ簱搴撲綅缂栧彿", example = "1")
+    private Long areaId;
+
+    @Schema(description = "鍏ュ簱搴撲綅鍚嶇О")
+    private String areaName;
+
     @Schema(description = "瑙勬牸鍨嬪彿")
     private String specification;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductSaveReqVO.java
index db5ecf1..7af1dfa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/product/MesProRouteProductSaveReqVO.java
@@ -21,6 +21,15 @@
     @NotNull(message = "浜у搧鐗╂枡缂栧彿涓嶈兘涓虹┖")
     private Long itemId;
 
+    @Schema(description = "鎶ュ伐鍏ヤ粨搴撶紪鍙凤紙鍏宠仈 mes_wm_warehouse锛�", example = "1")
+    private Long warehouseId;
+
+    @Schema(description = "鍏ュ簱搴撳尯缂栧彿锛堝叧鑱� mes_wm_warehouse_location锛�", example = "1")
+    private Long locationId;
+
+    @Schema(description = "鍏ュ簱搴撲綅缂栧彿锛堝叧鑱� mes_wm_warehouse_area锛�", example = "1")
+    private Long areaId;
+
     @Schema(description = "鐢熶骇鏁伴噺", example = "100")
     private Integer quantity;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProductDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProductDO.java
index 3c34218..b9a65ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProductDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProductDO.java
@@ -41,6 +41,24 @@
      */
     private Long itemId;
     /**
+     * 鎶ュ伐鍏ヤ粨搴撶紪鍙�
+     *
+     * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO#getId()}
+     */
+    private Long warehouseId;
+    /**
+     * 鍏ュ簱搴撳尯缂栧彿
+     *
+     * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO#getId()}
+     */
+    private Long locationId;
+    /**
+     * 鍏ュ簱搴撲綅缂栧彿
+     *
+     * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO#getId()}
+     */
+    private Long areaId;
+    /**
      * 鐢熶骇鏁伴噺
      */
     private Integer quantity;
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