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/WarehouseGoodsShelvesRowcolServiceImpl.java | 50 ++++++++++++++++----------------------------------
1 files changed, 16 insertions(+), 34 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..aa624ea 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.warehouse.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,48 +28,27 @@
implements WarehouseGoodsShelvesRowcolService {
@Autowired
private WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
+ @Autowired
+ private DocumentationMapper documentationMapper;
@Override
- public IPage<WarehouseGoodsShelvesRowcol> listPage(Page page, WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
- IPage<WarehouseGoodsShelvesRowcol> list = warehouseGoodsShelvesRowcolMapper.listPage(page, warehouseGoodsShelvesRowcol);
+ public List<WarehouseGoodsShelvesRowcolDto> getList(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
+ List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolMapper.findList(warehouseGoodsShelvesRowcol);
return list;
}
-
@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;
- }
- }
- int i = warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
- if(i!=ids.size()){
- log.error("鍒犻櫎澶辫触");
- return false;
- }
+ // 3. 妫�鏌ユ槸鍚︽湁鍟嗗搧
+ Wrapper<Documentation> queryWrapper = new LambdaQueryWrapper<Documentation>()
+ .in(Documentation::getWarehouseGoodsShelvesRowcolId, ids);
+ List<Documentation> documentations = documentationMapper.selectList(queryWrapper);
+ if (!documentations.isEmpty()) throw new RuntimeException("璐ф灦涓嬫湁鍟嗗搧锛屼笉鑳藉垹闄�");
+ warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
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