提交仓库配置方法

jiazx0107

2026-01-04 797b7188efb508aa6851b5448e3211513c2e7a63

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

@@ -1,9 +1,13 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.AuditStatus;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.ExportWordParam;
import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
import com.fzzy.igds.mapper.InoutNoticeOutMapper;
import com.fzzy.igds.domain.InoutNoticeIn;
@@ -11,12 +15,15 @@
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description 出入库通知单service层，包含入库通知单和出库通知单
@@ -31,6 +38,10 @@
    private InoutNoticeInMapper noticeInMapper;
    @Resource
    private InoutNoticeOutMapper noticeOutMapper;
    @Resource
    private DepotService depotService;
    @Resource
    private CoreDeptService coreDeptService;

    /*----------------------入库通知单信息-------------------------*/
    /**
@@ -62,22 +73,22 @@

    /**
     * 根据条件查询
     * @param companyId
     * @param deptId
     * @param completeStatus
     * @return
     */
    public List<InoutNoticeIn> getNoticeIn(String companyId, String deptId, String completeStatus) {
    public List<InoutNoticeIn> getNoticeIn(NoticeParam param) {

        QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();
        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(param.getCompanyId())){
            queryWrapper.eq("company_id", param.getCompanyId());
        }
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        if(StringUtils.isNotBlank(param.getDeptId())){
            queryWrapper.eq("dept_id", param.getDeptId());
        }
        if(StringUtils.isNotBlank(completeStatus)){
            queryWrapper.eq("complete_status", completeStatus);
        if(StringUtils.isNotBlank(param.getCompleteStatus())){
            queryWrapper.eq("complete_status", param.getCompleteStatus());
        }
        if(StringUtils.isNotBlank(param.getKey())){
            queryWrapper.like("name", param.getKey());
        }
        queryWrapper.orderByDesc("create_time");
        
@@ -97,16 +108,6 @@
    }

    /**
     * 查询数据
     * @param companyId
     * @param deptId
     * @return
     */
    public List<InoutNoticeIn> listNoticeIn(String companyId, String deptId) {
        return this.getNoticeIn(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
    }

    /**
     *  查询数据
     * @param companyId
     * @return
@@ -115,7 +116,10 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        return this.getNoticeIn(companyId, null, Constant.COMPLETE_STATUS_NONE);
        NoticeParam param = new NoticeParam();
        param.setCompanyId(companyId);
        param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
        return this.getNoticeIn(param);
    }

    /**
@@ -130,7 +134,7 @@
            data.setUpdateTime(new Date());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
            data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
            data.setAuditStatus(AuditStatus.STATUS_10.getCode());
            data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
            noticeInMapper.insert(data);
        } else {
@@ -183,22 +187,21 @@

    /**
     * 根据条件查询
     * @param companyId
     * @param deptId
     * @param completeStatus
     * @return
     */
    public List<InoutNoticeOut> getNoticeOut(String companyId, String deptId, String completeStatus) {

    public List<InoutNoticeOut> getNoticeOut(NoticeParam param) {
        QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(param.getCompanyId())){
            queryWrapper.eq("company_id", param.getCompanyId());
        }
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        if(StringUtils.isNotBlank(param.getDeptId())){
            queryWrapper.eq("dept_id", param.getDeptId());
        }
        if(StringUtils.isNotBlank(completeStatus)){
            queryWrapper.eq("complete_status", completeStatus);
        if(StringUtils.isNotBlank(param.getCompleteStatus())){
            queryWrapper.eq("complete_status", param.getCompleteStatus());
        }
        if(StringUtils.isNotBlank(param.getKey())){
            queryWrapper.like("name", param.getKey());
        }
        queryWrapper.orderByDesc("create_time");

@@ -218,16 +221,6 @@
    }

    /**
     * 查询数据
     * @param companyId
     * @param deptId
     * @return
     */
    public List<InoutNoticeOut> listNoticeOut(String companyId, String deptId) {
        return this.getNoticeOut(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
    }

    /**
     * Mybatis-plus 获取信息
     * @param companyId
     * @return
@@ -236,7 +229,10 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        return this.getNoticeOut(companyId, null,Constant.COMPLETE_STATUS_NONE);
        NoticeParam param = new NoticeParam();
        param.setCompanyId(companyId);
        param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
        return this.getNoticeOut(param);
    }

    /**
@@ -251,7 +247,7 @@
            data.setUpdateTime(new Date());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
            data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
            data.setAuditStatus(AuditStatus.STATUS_10.getCode());
            data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
            noticeOutMapper.insert(data);
        } else {
@@ -395,4 +391,110 @@
        return null;
    }

    /**
     *
     * @param param
     * @return
     */
    public ExportWordParam handleInData(ExportWordParam param) {

        InoutNoticeIn notice = this.getNoticeInOne(param.getBizId());

        //转换为模板需要的map数据源
        Map<String, Object> map = new HashMap();

        map.put("serId", notice.getId());
        map.put("name", notice.getName());

        String type = "";
        if("10".equals(notice.getType())){
            type = "库区通知单";
        }
        if("20".equals(notice.getType())){
            type = "监管通知单";
        }
        map.put("type", type);

        map.put("customerName", notice.getCustomerName());

        String unitName = "";
        Dept dept = coreDeptService.getDeptById(notice.getUnitName());
        if(dept != null){
            unitName = dept.getKqmc();
        }
        map.put("unitName", unitName);

        Depot depot = depotService.getCacheDepot(notice.getCompanyId(), notice.getDepotId());
        String depotId = "";
        if(dept != null){
            depotId = depot.getName();
        }
        map.put("depotId", depotId);

        map.put("year", notice.getYear());
        map.put("targetNumber", notice.getTargetNumber());
        map.put("completeNumber", notice.getCompleteNumber());
        map.put("completeStatus", notice.getCompleteStatus());
        map.put("contract", notice.getContract());
        map.put("remark", notice.getRemark());
        map.put("createUser", notice.getCreateBy());
        map.put("createTime", DateFormatUtils.format(notice.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));

        param.setDataMap(map);
        return param;
    }

    /**
     *
     * @param param
     * @return
     */
    public ExportWordParam handleOutData(ExportWordParam param) {

        InoutNoticeOut notice = this.getNoticeOutOne(param.getBizId());

        //转换为模板需要的map数据源
        Map<String, Object> map = new HashMap();

        map.put("serId", notice.getId());
        map.put("name", notice.getName());

        String type = "";
        if("10".equals(notice.getType())){
            type = "库区通知单";
        }
        if("20".equals(notice.getType())){
            type = "监管通知单";
        }
        map.put("type", type);

        map.put("customerName", notice.getCustomerName());

        String unitName = "";
        Dept dept = coreDeptService.getDeptById(notice.getUnitName());
        if(dept != null){
            unitName = dept.getKqmc();
        }
        map.put("unitName", unitName);

        Depot depot = depotService.getCacheDepot(notice.getCompanyId(), notice.getDepotId());
        String depotId = "";
        if(dept != null){
            depotId = depot.getName();
        }
        map.put("depotId", depotId);

        map.put("year", notice.getYear());
        map.put("targetNumber", notice.getTargetNumber());
        map.put("completeNumber", notice.getCompleteNumber());
        map.put("completeStatus", notice.getCompleteStatus());
        map.put("contract", notice.getContract());
        map.put("remark", notice.getRemark());
        map.put("createUser", notice.getCreateBy());
        map.put("createTime", DateFormatUtils.format(notice.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));

        param.setDataMap(map);
        return param;
    }

}