Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx

yaowanxin

10 天以前 2e67b4a6d474c584daf2ab1ff1df9d785f902b96

 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);
    }
}