最新版本541200007

doum

2 天以前 1674f2b873da35814f5f1bdd199b0b37d5d04a3b

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.PageData;
@@ -16,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -36,6 +39,8 @@

    @Autowired
    private PlatformWmsJobMapper platformWmsJobMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private PlatformWmsDetailMapper platformWmsDetailMapper;
@@ -95,21 +100,31 @@
        if(Objects.isNull(platformWmsJob)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到运单信息");
        }
        String codeStr =systemDictDataBiz.queryByCode(Constants.WMS_PARAM, Constants.WMS_IN_REPERTOTY_CODE_LIST).getCode();
        List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>()
                .lambda().eq(PlatformWmsDetail::getJobId,id).eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
            platformWmsJob.setIoQty(
                    platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
            );
            for(PlatformWmsDetail d :platformWmsDetailList){
                if(StringUtils.isNotBlank(d.getInRepertotyCode())){
                    //供应商名称
                    d.setInRepertotyName(Constants.getWmsAreasNameByCode(codeStr,d.getInRepertotyCode()));
                }
            }
            //获取所有合同号(去重）
            List<String> ioCodeList = platformWmsDetailList.stream().map(m->m.getContractNum()).distinct().collect(Collectors.toList());
            Set<String> ioCodeSet = new HashSet<String>(ioCodeList);
            List<WmsJobContractVO> wmsJobContractVOList = new ArrayList<>();
            for (String ioCode:ioCodeSet) {
                if(StringUtils.isBlank(ioCode)){
//                    continue;
                }
                WmsJobContractVO wmsJobContractVO = new WmsJobContractVO();
                wmsJobContractVO.setContractCode(ioCode);
                wmsJobContractVO.setPlatformWmsDetailList(
                        platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList())
                        platformWmsDetailList.stream().filter(i-> StringUtils.equals(i.getContractNum(),ioCode)).collect(Collectors.toList())
                );
                if(wmsJobContractVO.getPlatformWmsDetailList()!=null&& wmsJobContractVO.getPlatformWmsDetailList().size()>0){
                    wmsJobContractVO.setAddress(wmsJobContractVO.getPlatformWmsDetailList().get(0).getRepertotyAddress());
@@ -118,7 +133,7 @@
                        com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
                    if(Constants.equalsInteger(platformWmsJob.getType(),Constants.ONE)){
                        if(Objects.isNull(wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus())){
                            wmsJobContractVO.setLockStatus(Constants.ZERO
                                     wmsJobContractVO.setLockStatus(Constants.ZERO
                            );
                        }else{
                            wmsJobContractVO.setLockStatus(