From 3d235e48f6b0fff313b84d21edeb6f60e02a5ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 17 Apr 2026 19:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseApplicationService.java          | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
index 4c8b96457..58c70ce15 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
@@ -2,9 +2,6 @@ package com.mhd.basic.application.service.warehouse;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO;
-import com.mhd.basic.domain.areaAggregate.repository.todo.SysProvinceCityCountyDO;
-import com.mhd.basic.domain.areaAggregate.service.SysProvinceCityCountyDomainService;
 import com.mhd.basic.domain.associationWarehouse.entity.AssociationWarehouse;
 import com.mhd.basic.domain.associationWarehouse.repository.facade.IAssociationWarehouseService;
 import com.mhd.basic.domain.warehouse.repository.po.WarehousePO;
@@ -39,8 +36,6 @@ public class WarehouseApplicationService {
     @Autowired
     private ISysDictTypeService dictTypeService;
     @Autowired
-    private SysProvinceCityCountyDomainService sysProvinceCityCountyDomainService;
-    @Autowired
     private IAssociationWarehouseService associationWarehouseService;
 
 
@@ -180,14 +175,20 @@ public class WarehouseApplicationService {
         }
         SysDictData warmLayerDictDataVo = warmLayerDictDataList.stream().filter(info -> ObjectUtil.equal(info.getDictValue(), warehouseDO.getWarmLayerCode())).findAny().orElse(null);
         if (null == warmLayerDictDataVo) {
-            throw new ServiceException("温层类型【" + warehouseDO.getWarehouseType() + "】数据字典不存在 请联系管理员");
+            throw new ServiceException("温层类型【" + warehouseDO.getWarmLayerCode() + "】数据字典不存在 请联系管理员");
         }
         warehouseDO.setWarmLayerName(warmLayerDictDataVo.getDictLabel());
-        //翻译省市区
-        SysProvinceCityCountyDO loadingProvinceCityCountyDO = new SysProvinceCityCountyDO();
-        loadingProvinceCityCountyDO.setCountyCode(Long.parseLong(warehouseDO.getRegionCode()));
-        SysAreaPO sysAreaPO = sysProvinceCityCountyDomainService.findAreaInfo(loadingProvinceCityCountyDO);
-        warehouseDO.setRegionName(sysAreaPO.getProvinceCityCountyName());
+        // 翻译省市区（已注释：不再根据 regionCode 回填 regionName）
+        /*
+        if (StrUtil.isNotBlank(warehouseDO.getRegionCode())) {
+            SysProvinceCityCountyDO loadingProvinceCityCountyDO = new SysProvinceCityCountyDO();
+            loadingProvinceCityCountyDO.setCountyCode(Long.parseLong(warehouseDO.getRegionCode().trim()));
+            SysAreaPO sysAreaPO = sysProvinceCityCountyDomainService.findAreaInfo(loadingProvinceCityCountyDO);
+            if (sysAreaPO != null) {
+                warehouseDO.setRegionName(sysAreaPO.getProvinceCityCountyName());
+            }
+        }
+        */
     }
 
     /**