Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

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

@@ -192,6 +192,7 @@
    @Override
    @Transactional
    public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list) {
        try{
        if(list ==null || list.getData()==null|| list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
@@ -245,12 +246,12 @@
                    iocodeList.add(d.getIoCode());
                    details.add(entity);
                }
                if(job.getIsNew() == 1&& iocodeList.size()>0){
                    if(job.getIsNew() != 1&& iocodeList.size()>0){
                    //先清理同一个承运单号下重复推送的iocode数据，以最后一次推送为主
                    platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                            .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsDetail::getJobId,job.getJobId())
                                .eq(PlatformWmsDetail::getWmsJobId,job.getId())
                            .in(PlatformWmsDetail::getIocode,iocodeList)
                    );
                }
@@ -261,6 +262,10 @@
        }
        if(jobList.size()>0){
            startEndNoticeToDriver(jobList);
            }
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
@@ -331,8 +336,6 @@
        platformJobMapper.insert(job);
        return job;
    }


    /**
     * 出库通知任务业务处理
     * @param list 参数
@@ -340,6 +343,8 @@
     */
    @Override
    public WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list) {

        try{
        if(list ==null ||list.getData()==null ||  list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
@@ -385,18 +390,19 @@
                    entity.setJobId(job.getJobId());
                    entity.setWmsJobId(job.getId());
                    entity.setIoQty(d.getIoQty());
                        entity.setWmsJobId(job.getId());
                    entity.setStatus(Constants.ZERO);
                    entity.setRate(d.getRate());
                    entity.setMaterialName(d.getMaterialName());
                    iocodeList.add(d.getIoCode());
                    details.add(entity);
                }
                if(job.getIsNew() == 1&& iocodeList.size()>0){
                    if(job.getIsNew() != 1 && iocodeList.size()>0){
                    //先清理同一个承运单号下重复推送的iocode数据，以最后一次推送为主
                    platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                            .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsDetail::getJobId,job.getJobId())
                                .eq(PlatformWmsDetail::getWmsJobId,job.getId())
                            .in(PlatformWmsDetail::getIocode,iocodeList)
                    );
                }
@@ -408,6 +414,10 @@
        if(jobList.size()>0){
            startEndNoticeToDriver(jobList);
        }
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
    /**
@@ -417,9 +427,28 @@
     */
    @Override
    public WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
        //TODO-------------------处理入库取消通知业务--------------------
        if(list ==null||list.getData()==null || list.getData().size() ==0){
        //-----------------处理入库取消通知业务--------------------
        try {
            if(list ==null||list.getData()==null || list.getData().size() ==0 || list.getData().get(0).getIoCode() == null){
            return returnFailReuslt("请求参数不正确，参数不能为空");
            }
            List<String> iocodeList = new ArrayList<>();
            for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
                    iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
            }
            //取消全部数据状态为 【已取消】
            platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                    .set(PlatformWmsDetail::getStatus,Constants.TWO)
                    .in(PlatformWmsDetail::getIocode,iocodeList)
                    .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
@@ -430,18 +459,28 @@
     */
    @Override
    public WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
        try {
        if(list ==null||list.getData()==null || list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
            iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
        }
        //取消全部数据状态为 【已取消】
         platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.TWO)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        }catch (Exception e){
            log.error("【WMS】出库取消通知任务业务处理===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
    /**
@@ -451,19 +490,28 @@
     */
    @Override
    public WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list) {
        try {
        if(list ==null||list.getData()==null || list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
            iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
        }
        //取消全部数据状态为 【已完成】
        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.ONE)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));

        }catch (Exception e){
            log.error("【WMS】作业完成通知任务业务处理===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }

@@ -475,6 +523,7 @@

    private WmsBaseResponse returnFailReuslt(String msg) {
        WmsBaseResponse response = new WmsBaseResponse();
        response.setCode(-1);
        response.setData(new ArrayList<>());
        WmsBaseDataResponse rData = new WmsBaseDataResponse();
        rData.setMsgDescr(msg);
@@ -491,6 +540,7 @@

    private WmsBaseResponse returnSuccessReuslt(String msg) {
        WmsBaseResponse response = new WmsBaseResponse();
        response.setCode(1);
        response.setData(new ArrayList<>());
        WmsBaseDataResponse rData = new WmsBaseDataResponse();
        rData.setMsgDescr(StringUtils.defaultString(msg,"操作成功"));