From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
index bcc475a..4a98196 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.warehouse.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.sql.Array;
import java.util.List;
/**
@@ -30,22 +32,21 @@
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
@Override
- public IPage<Warehouse> listPage(Page page, Warehouse warehouse) {
- return warehouseMapper.listPage(page, warehouse);
+ public List<Warehouse> listPage(Warehouse warehouse) {
+ return warehouseMapper.listPage( warehouse);
}
@Override
public boolean deleteByIds(List<Long> ids) {
for (Long id : ids) {
- WarehouseGoodsShelves shelves = new WarehouseGoodsShelves();
- shelves.setWarehouseId(id);
- IPage<WarehouseGoodsShelves> page = warehouseGoodsShelvesService.listPage(new Page<>(), shelves);
- if(page.getRecords().size()>0){
- log.error("浠撳簱涓嬫湁璐ф灦,涓嶈兘鍒犻櫎");
+ List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
+ .eq(WarehouseGoodsShelves::getWarehouseId, id));
+ if(list.size()>0){
+ log.error("浠撳簱涓嬫湁璐ф灦,涓嶈兘鍒犻櫎 閲嶆柊閫夋嫨");
return false;
}
}
- return true;
+ return removeByIds(ids);
}
}
--
Gitblit v1.9.3