feat: 部门退回/报废公用接口

cy

2023-12-01 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java

@@ -15,29 +15,19 @@
import com.consum.base.pojo.response.FormTransferGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModel;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.consum.model.po.*;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;

import java.util.*;

/**
 * @Description 调拨管理
@@ -70,7 +60,7 @@
    @Autowired
    private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
    @Autowired
    private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
    private BaseWarehouseManagerService baseWarehouseManagerService;
    @Autowired
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;

@@ -132,7 +122,7 @@
            Long id = sysInfo.getId();
            BaseWarehouseManager manager = new BaseWarehouseManager();
            manager.setManagerId(id);
            List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
            List<BaseWarehouseManager> managerList = baseWarehouseManagerService.selectAll(manager);
            if (CollectionUtils.isEmpty(managerList)) {
                log.error("该用户不是库管员");
                throw new Exception("该用户不是库管员");
@@ -197,7 +187,11 @@
                    int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
                    lWhProcureModel.setWorehouseCount(goodsNum);
                }
                if (businessType == 1) {
                    lWhProcureModel.setBusinessType(4);
                }
                lWhProcureModel.setCounts(model.getCounts());
                lWhProcureModel.setUseCount(model.getCounts());
                lWhProcureModel.setBusinessId(lWhFormTransferId);
                lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
                //根据型号id查询型号
@@ -213,7 +207,6 @@
                // 单据类型 1 采购2 调拨 3出库4部门分发
                //部门分发类型
                if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
                    lWhProcureModel.setBusinessType(4);
                    LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
                    lWhProcureModelUserRecord.setId(IdUtil.generateId());
                    lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
@@ -231,6 +224,7 @@
                        lWhProcureModelUser.setNowUserName(lWhProcureModelUserParam.getNowUserName());
                        lWhProcureModelUser.setNowUserPhone(lWhProcureModelUserParam.getNowUserPhone());
                        lWhProcureModelUser.setGoodsNum(lWhProcureModelUserParam.getGoodsNum());
                        lWhProcureModelUser.setUseCount(lWhProcureModelUser.getGoodsNum());
                        lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
                        procureModelUserList.add(lWhProcureModelUser);
                    }
@@ -404,11 +398,12 @@
     * @Author 卢庆阳
     * @Date 2023/10/31
     */
    public Map<String, Object> export(Long id) {
    public Map<String, Object> export(Long id, Integer type) {
        String sql = "SELECT\n"
            + "\tft.BUSINESS_FORM_CODE,\n"
            + "\tft.OPERATOR_NAME,\n"
            + "\tft.CREATE_TIME,\n"
            + "\tft.IN_AGENCY_NAME,\n"
            + "\tft.OUT_AGENCY_NAME,\n"
            + "\tGOODS_NAME,\n"
            + "\tpm.BASE_GOODS_MODELS_NAME,\n"
@@ -429,6 +424,11 @@
        List<TemplateExcelTransfer> list = Lists.newArrayList();
        select.forEach(item -> {
            TemplateExcelTransfer templateExcelTransfer = MapUtils.convertMapToObj(item, TemplateExcelTransfer.class);
            if (type == 1) {
                templateExcelTransfer.setTenantName(templateExcelTransfer.getOutAgencyName());
            } else {
                templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
            }
            list.add(templateExcelTransfer);
        });

@@ -439,10 +439,16 @@
        String businessFormCode = entity.getBusinessFormCode();
        Long createTime = entity.getCreateTime();
        String operatorName = entity.getOperatorName();

        String tenantName;
        if (type == 1) {
            tenantName = entity.getInAgencyName();
        } else {
            tenantName = entity.getOutAgencyName();
        }
        Map<String, Object> map = new HashMap<>();
        map.put("code", businessFormCode);
        map.put("date", DateUtils.toShowDate(createTime));
        map.put("tenantName", tenantName);
        map.put("name", operatorName);
        map.put("countNum", countNum);
        map.put("totalAmount", totalAmount);