调整出入库配置

jiazx0107

2026-01-05 2fcf73e5783a7a06dd4d4e6f412b9f759a7230c1

 fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java

@@ -3,14 +3,20 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -25,17 +31,71 @@
    @Resource
    private DepotService depotService;

    @Resource
    private PledgeContractService pledgeContractService;

    /**
     * depotPR#getData
     *
     * @return
     */
    @DataProvider
    public List<Depot> getData(){
        return depotService.getData(null, null);
    public List<Depot> getData(String parentId) {
        if (StringUtils.isNotEmpty(parentId)) {
            return depotService.getData(null, parentId, false);
        }
        return depotService.getData(null, ContextUtil.subDeptId(null), false);
    }

    /**
     *
     * TODO 当前方法取消，逻辑调整为在提交时候验证是否是银行监管仓，默认获取相应的列表
     * depotPR#getDataByBankId
     *
     * @return
     */
    @DataProvider
    public List<Depot> getDataByBankId(String bankId) {
        if (StringUtils.isNotEmpty(bankId)) {
            //查询银行对应的监管仓库
            IgdsBaseParam baseParam = new IgdsBaseParam();
            baseParam.setBankId(bankId);
            List<PledgeContract> pledgeContracts = pledgeContractService.listAll(baseParam);

            // 提取所有 PledgeContract 中 depot_ids 字段包含的 depot ID
            List<String> validDepotIds = new ArrayList<>();
            for (PledgeContract contract : pledgeContracts) {
                if (StringUtils.isNotEmpty(contract.getDepotIds())) {
                    // 将逗号分隔的 depot_ids 转换为 Set
                    String[] ids = contract.getDepotIds().split(",");
                    for (String id : ids) {
                        if (StringUtils.isNotEmpty(id.trim())) {
                            validDepotIds.add(id.trim());
                        }
                    }
                }
            }
            List<Depot> allData = depotService.getData(null, ContextUtil.subDeptId(null), false);
            if (!validDepotIds.isEmpty()) {
                // 过滤出在 PledgeContract.depot_ids 中出现的 depot
                List<Depot> filteredData = new ArrayList<>();

                for (Depot allDatum : allData) {
                    if (validDepotIds.contains(allDatum.getId())) {
                        filteredData.add(allDatum);
                    }
                }
                return filteredData;
            }
            return new ArrayList<>();

        }
        return depotService.getData(null, ContextUtil.subDeptId(null), false);
    }

    /**
     * depotPR#saveOrUpdate
     *
     * @param data
     * @return
     */
@@ -51,11 +111,12 @@

    /**
     * depotPR#deleteDepot
     *
     * @param data
     */
    @Expose
    @Transactional
    public void deleteDepot(Depot data)  {
    public void deleteDepot(Depot data) {
        Depot depot = new Depot();
        BeanUtils.copyProperties(data, depot);
        depotService.deleteDepot(depot);
@@ -71,6 +132,7 @@

    /**
     * ${dorado.getDataProvider("depotPR#getAllCache").getResult()}
     *
     * @return
     */
    @DataProvider
@@ -80,6 +142,7 @@

    /**
     * depotPR#ajaxGetAllCache
     *
     * @return
     */
    @Expose
@@ -88,6 +151,16 @@
    }

    /**
     * depotPR#getDataByCompanyId
     *
     * @return
     */
    @DataProvider
    public List<Depot> getDataByCompanyId() {
        return depotService.getData(null, null, false);
    }

    /**
     * depotPR#getDepot 获取仓库信息
     *
     * @param depotId