From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 10:05:05 +0800
Subject: [PATCH] 仓库,树,文档,借出修改

---
 src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
index 21d76d4..09d1c78 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -9,6 +9,7 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
 import com.ruoyi.warehouse.mapper.DocumentationMapper;
 import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper;
 import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper;
@@ -49,10 +50,6 @@
     private DocumentationService documentationService;
     @Autowired
     private DocumentationMapper documentationMapper;
-    @Override
-    public IPage<WarehouseGoodsShelves> listPage(Page page, WarehouseGoodsShelves warehouseGoodsShelves) {
-        return warehouseGoodsShelvesMapper.listPage(page,warehouseGoodsShelves);
-    }
 
     @Override
     public boolean add(WarehouseGoodsShelves warehouseGoodsShelves) {
@@ -109,7 +106,7 @@
         Wrapper<Documentation> queryWrapper1 = new LambdaQueryWrapper<Documentation>()
                 .in(Documentation::getWarehouseGoodsShelvesRowcolId, rowcolIds);
         List<Documentation> documentations = documentationMapper.selectList(queryWrapper1);
-        if (!documentations.isEmpty()) return false;
+        if (!documentations.isEmpty()) throw new RuntimeException("璐ф灦涓嬫湁鍟嗗搧锛屼笉鑳藉垹闄�");
 
         // 鍏堟洿鏂拌揣鏋朵富淇℃伅
         updateById(warehouseGoodsShelves);
@@ -148,7 +145,7 @@
             Wrapper<Documentation> queryWrapper1 = new LambdaQueryWrapper<Documentation>()
                     .in(Documentation::getWarehouseGoodsShelvesRowcolId, rowcolIds);
             List<Documentation> documentations = documentationMapper.selectList(queryWrapper1);
-            if (!documentations.isEmpty()) return false; // 浠讳竴璐ф灦鏈夊晢鍝佸垯缁堟鍒犻櫎
+            if (!documentations.isEmpty()) throw new RuntimeException("璐ф灦涓嬫湁鍟嗗搧锛屼笉鑳藉垹闄�"); // 浠讳竴璐ф灦鏈夊晢鍝佸垯缁堟鍒犻櫎
         }
 
         // 3. 鍏堝垹闄よ揣鏋朵富璁板綍
@@ -166,9 +163,10 @@
         return true;
     }
 
+
     @Override
-    public List<WarehouseGoodsShelves> list(WarehouseGoodsShelves warehouseGoodsShelves) {
-        return warehouseGoodsShelvesMapper.list(warehouseGoodsShelves);
+    public List<WarehouseGoodsShelves> findList(WarehouseGoodsShelves warehouseGoodsShelves) {
+        return warehouseGoodsShelvesMapper.listAll(warehouseGoodsShelves);
     }
 
 }

--
Gitblit v1.9.3