From b5f142cc3e944c4b5b2addd8ddaffc9159e22b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Wed, 14 Jan 2026 17:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternalWarehouseMapper.java                |  4 ++--
 .../InternalWarehouseServiceImpl.java           | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
index fb99b541..e3d208af 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
@@ -35,8 +35,8 @@ public interface InternalWarehouseMapper extends BaseMapperX<InternalWarehouseDO
                 .eqIfPresent(InternalWarehouseDO::getCompanyNameCustom, reqVO.getCompanyNameCustom())
                 .orderByDesc(InternalWarehouseDO::getId));
     }
-    @Select("SELECT COUNT(*) AS total FROM bse_intl_wrh WHERE NUM = #{number}")
+    @Select("SELECT * FROM bse_intl_wrh WHERE NUM = #{number}")
     @TenantIgnore
-    Long selectCountByNumber(String number);
+    InternalWarehouseDO selectInternalWarehouseDOByNumber(String number);
 
 }
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java
index 8961bac5..a7f27b73 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java
@@ -21,7 +21,6 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 
 
-
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
@@ -46,23 +45,29 @@ public class InternalWarehouseServiceImpl implements InternalWarehouseService {
         // 插入
         InternalWarehouseDO internalWarehouse = BeanUtils.toBean(createReqVO, InternalWarehouseDO.class);
         //校验所绑定的库位是否已经存在
-        validateInternalWarehouseExists(createReqVO.getNumber());
+        validateInternalWarehouseExists(createReqVO.getNumber(), "insert", null);
         internalWarehouseMapper.insert(internalWarehouse);
         // 返回
         return BeanUtils.toBean(internalWarehouse, InternalWarehouseRespVO.class);
     }
 
 
-    public void validateInternalWarehouseExists(String number){
-        if (internalWarehouseMapper.selectCountByNumber(number)>0) {
+    public void validateInternalWarehouseExists(String number, String type, Long id) {
+        InternalWarehouseDO internalWarehouseDO = internalWarehouseMapper.selectInternalWarehouseDOByNumber(number);
+        if (internalWarehouseDO != null && "insert".equals(type)) {
+            throw exception(INTERNAL_WAREHOUSE_EXISTS);
+        } else if (internalWarehouseDO != null && "update".equals(type) && !Objects.equals(id, internalWarehouseDO.getId())) {
             throw exception(INTERNAL_WAREHOUSE_EXISTS);
         }
 
     }
+
     @Override
     public void updateInternalWarehouse(InternalWarehouseSaveReqVO updateReqVO) {
         // 校验存在
         validateInternalWarehouseExists(updateReqVO.getId());
+        // 校验所绑定的库位是否已经存在
+        validateInternalWarehouseExists(updateReqVO.getNumber(), "update", updateReqVO.getId());
         // 更新
         InternalWarehouseDO updateObj = BeanUtils.toBean(updateReqVO, InternalWarehouseDO.class);
         internalWarehouseMapper.updateById(updateObj);
@@ -77,12 +82,12 @@ public class InternalWarehouseServiceImpl implements InternalWarehouseService {
     }
 
     @Override
-        public void deleteInternalWarehouseListByIds(List<Long> ids) {
+    public void deleteInternalWarehouseListByIds(List<Long> ids) {
         // 校验存在
         validateInternalWarehouseExists(ids);
         // 删除
         internalWarehouseMapper.deleteByIds(ids);
-        }
+    }
 
     private void validateInternalWarehouseExists(List<Long> ids) {
         List<InternalWarehouseDO> list = internalWarehouseMapper.selectByIds(ids);