粮情报表，数量监测报表，库区回显错误纠正

sgj

2026-03-24 deb8a2c32ba0cb7a88819b54d720418cdc2f7ebb

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java

@@ -2,17 +2,23 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotStore;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.mapper.DepotMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;

/**
 * @Description
@@ -27,30 +33,35 @@
    private DepotMapper depotMapper;
    @Resource
    private RedisCache redisCache;
    @Resource
    private DepotStoreService depotStoreService;

    @Resource
    private CoreDeptService coreDeptService;

    /**
     * 查询库区下仓库列表
     *
     * @param companyId
     * @param deptId
     * @param idDesc 是否ID倒序排列
     * @param idDesc    是否ID倒序排列
     * @return
     */
    public List<Depot> getData(String companyId, String deptId, boolean idDesc) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        

        QueryWrapper<Depot> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(deptId)){
        if (StringUtils.isNotBlank(deptId)) {
            queryWrapper.likeRight("dept_id", deptId);
        }
        
        if(idDesc){

        if (idDesc) {
            //ID倒序
            queryWrapper.orderByDesc("id");
        }else {
        } else {
            //序号正序
            queryWrapper.orderByAsc("order_num");
        }
@@ -59,7 +70,53 @@
    }

    /**
     * 根据用户类型查询所有仓库，作为dorado的map回显使用
     *
     * @param deptId
     * @author sgj
     * @since 2026/03/24
     */
    public List<Depot> getDepotByUserType(String deptId) {
        List<Depot> result = new ArrayList<>();

        if (StringUtils.isNotBlank(deptId)) {
            //查公司下所有库区
            result = this.getData(null, deptId, false);
            return result;
        }
        //获取当前登录人
        SysUser user = ContextUtil.getLoginUser();

        if (Constant.USER_TYPE_10.equals(user.getUserType())) {
            //监管用户，直接查询组织下所有库区
            result = this.getData(user.getCompanyId(), null, false);
            return result;
        }
        if (Constant.USER_TYPE_20.equals(user.getUserType())) {
            //银行用户，根据合同查询银行下所有库区
            List<Dept> deptByBank = coreDeptService.getDeptByBank(user.getUserData());
            for (Dept dept : deptByBank) {
                result.addAll(this.getData(null, dept.getId(), false));
            }
            return result;
        }
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
            //库区用户
            if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
                //查询用户所属库区
                result = this.getData(null, user.getDeptId() + "", false);
            } else {
                //查询用户所属公司下所有库区
                result = this.getData(user.getCompanyId(), null, false);
            }
            return result;
        }
        return result;
    }

    /**
     * 根据库存表信息，更新仓库库存
     *
     * @param data
     */
    public void updateByDepotStore(DepotStore data) {
@@ -91,11 +148,53 @@
            depot.setCreateBy(ContextUtil.getLoginUserName());
            depot.setCreateTime(new Date());
            depotMapper.insert(depot);
        }else {
        } else {
            depot.setUpdateBy(ContextUtil.getLoginUserName());
            depot.setUpdateTime(new Date());
            depotMapper.updateById(depot);
        }
        flushCache(depot.getCompanyId());
    }

    /**
     * 更新库存信息
     *
     * @param depot
     */
    public void updateStorageReal(Depot depot) {

        Depot cacheDepot = this.getCacheDepot(depot.getCompanyId(), depot.getId());

        depot.setUpdateBy(ContextUtil.getLoginUserName());
        depot.setUpdateTime(new Date());
        depot.setRemark("【" + ContextUtil.getLoginUserName() + "】于[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]修改库存：" + cacheDepot.getStorageReal() + "-->" + depot.getStorageReal());
        depotMapper.updateById(depot);

        DepotStore lastData = new DepotStore();

        //主键ID规则：yyyyMMddHHmm_仓库编码
        lastData.setId(DateFormatUtils.format(new Date(), "yyyyMMddHHmm") + "_" + depot.getId() + "_HAND");
        lastData.setCompanyId(depot.getCompanyId());
        lastData.setDeptId(depot.getDeptId());
        lastData.setDepotId(depot.getId());
        lastData.setStorageReal(0.0);
        lastData.setUpdateTime(new Date());
        lastData.setUpdateBy("系统定时统计");

        lastData.setDepotStatus(depot.getDepotStatus());
        lastData.setFoodVariety(depot.getFoodVariety());
        lastData.setFoodLevel(depot.getFoodLevel());
        lastData.setFoodLocation(depot.getFoodLocation());
        lastData.setFoodLocationId(depot.getFoodLocationId());
        lastData.setFoodType(depot.getFoodType());
        lastData.setFoodYear(depot.getFoodYear());

        lastData.setStorageReal(depot.getStorageReal());
        lastData.setCreateTime(new Date()); //设置为最新时间，其他系统可以通过此时间查询数据是否有更新修改，同步到省平台接口。
        lastData.setCreateBy(ContextUtil.getLoginUserName());
        lastData.setRemark("【" + ContextUtil.getLoginUserName() + "】于[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]修改库存为：" + depot.getStorageReal());

        depotStoreService.updateAndSave(lastData);
        flushCache(depot.getCompanyId());
    }

@@ -124,7 +223,7 @@
        if (StringUtils.isEmpty(depotId)) {
            return;
        }
        

        UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", depotId).set("depot_status", status);
        depotMapper.update(null, updateWrapper);
@@ -152,7 +251,7 @@
            companyId = ContextUtil.getCompanyId();
        }

        List<Depot> list = this.getData(companyId,null, false);
        List<Depot> list = this.getData(companyId, null, false);

        this.setCacheDepotList(list, companyId);
    }
@@ -168,7 +267,7 @@
        String key;
        for (Depot depot : list) {
            key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depot.getId());
            redisCache.setCacheObject(key, depot);
            redisCache.setCacheObject(key, depot, 24, TimeUnit.HOURS);
        }
    }

@@ -199,25 +298,35 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";

        Collection<String> keys = redisCache.keys(patten);
        if (null == keys) {
            return null;
        }

        List<Depot> list = new ArrayList<>();
        for (String key : keys) {
            list.add((Depot) redisCache.getCacheObject(key));

        String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";
        Collection<String> keys = redisCache.keys(patten);
        if (null != keys) {
            for (String key : keys) {
                if (null == redisCache.getCacheObject(key)) {
                    list = new ArrayList<>();
                    break;
                }
                list.add((Depot) redisCache.getCacheObject(key));
            }
        }

        //缓存获取为空，则查询数据库
        if (list.size() < 1) {
            list = this.getData(companyId,null, false);
        if (list.isEmpty()) {
            list = this.getData(companyId, null, false);
            setCacheDepotList(list, companyId);
        }

        //重新排序
        Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        if (!list.isEmpty()) {
            // 检查是否有仓库的排序号为空
            for (Depot depot : list) {
                if (null == depot.getOrderNum()) {
                    //排序号为空，则默认给1
                    depot.setOrderNum(1);
                }
            }
            Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        }
        return list;
    }

@@ -242,8 +351,10 @@
                result.add(depot);
            }
        }
        //重新排序
        Collections.sort(result, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        if (!result.isEmpty()) {
            //重新排序
            Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        }
        return result;
    }

@@ -264,7 +375,7 @@
        String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depotId);
        Depot depot = redisCache.getCacheObject(key);
        if (null == depot) {
            depot =  depotMapper.selectById(depotId);
            depot = depotMapper.selectById(depotId);
            redisCache.setCacheObject(key, depot);
        }
        return depot;
@@ -285,11 +396,11 @@
        }

        List<Depot> depotList = getCacheDepotList(ContextUtil.getCompanyId(), deptId);
        if(null == depotList || depotList.isEmpty()){
        if (null == depotList || depotList.isEmpty()) {
            return null;
        }
        for (Depot depot : depotList) {
            if(depotName.equals(depot.getName())){
            if (depotName.equals(depot.getName())) {
                return depot.getId();
            }
        }