From 7d188cc913d5ea547c5e99ae434ea3b1cf4e818a Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 15 八月 2025 09:00:41 +0800
Subject: [PATCH] 仓库货架业务流程修改

---
 src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
index 3a0f3cc..c564012 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
@@ -1,10 +1,14 @@
 package com.ruoyi.warehouse.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.warehouse.mapper.DocumentationMapper;
 import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper;
+import com.ruoyi.warehouse.pojo.Documentation;
 import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
 import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -25,6 +30,8 @@
     implements WarehouseGoodsShelvesRowcolService {
     @Autowired
     private WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
+    @Autowired
+    private DocumentationMapper documentationMapper;
 
     @Override
     public IPage<WarehouseGoodsShelvesRowcol> listPage(Page page, WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
@@ -34,13 +41,13 @@
 
     @Override
     public boolean deleteByIds(List<Long> ids) {
-        for (int i = 0; i < ids.size(); i++) {
-            Long id = ids.get(i);
-            WarehouseGoodsShelvesRowcol rowcol = warehouseGoodsShelvesRowcolMapper.selectById(id);
-            if(rowcol.getDocumentationId()!=null && rowcol.getDocumentationId()!=0){
-                log.error("璐ф灦涓婃湁鍟嗗搧,涓嶈兘鍒犻櫎");
-                return false;
-            }
+        // 3. 妫�鏌ユ槸鍚︽湁鍟嗗搧
+        Wrapper<Documentation> queryWrapper = new LambdaQueryWrapper<Documentation>()
+                .in(Documentation::getWarehouseGoodsShelvesRowcolId, ids);
+        List<Documentation> documentations = documentationMapper.selectList(queryWrapper);
+        if (!documentations.isEmpty()) {
+            log.error("璐ф灦[ID:{}]涓婂瓨鍦ㄥ晢鍝侊紝绂佹鍒犻櫎", ids);
+            return false;
         }
         int i = warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
         if(i!=ids.size()){
@@ -49,24 +56,6 @@
         }
         return true;
     }
-
-
-//    @Override
-//    public boolean add(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
-//        for (int i = 0; i < warehouseGoodsShelvesRowcol.getRow(); i++) {
-//            for (int j = 0; j < warehouseGoodsShelvesRowcol.getCol(); j++) {
-//                WarehouseGoodsShelvesRowcol rowcol = new WarehouseGoodsShelvesRowcol();
-//                rowcol.setRow((long) i);
-//                rowcol.setCol((long) j);
-//                rowcol.setWarehouseGoodsShelvesId(warehouseGoodsShelvesRowcol.getWarehouseGoodsShelvesId());
-//                rowcol.setWarehouseId(warehouseGoodsShelvesRowcol.getWarehouseId());
-//                rowcol.setCreateUser(warehouseGoodsShelvesRowcol.getCreateUser());
-//                rowcol.setCreateTime(warehouseGoodsShelvesRowcol.getCreateTime());
-//                warehouseGoodsShelvesRowcolMapper.insert(rowcol);
-//            }
-//        }
-//        return true;
-//    }
 }
 
 

--
Gitblit v1.9.3