From 2d2ac91d76af6ef4d755555c7623ee4e016a3066 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 29 九月 2024 15:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java |  433 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 251 insertions(+), 182 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 0096a70..fb0e58e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -14,6 +14,7 @@
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.WmsService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,8 @@
     private PlatformGroupMapper platformGroupMapper;
     @Autowired
     private CarsMapper carsMapper;
+    @Autowired
+    private MemberMapper memberMapper;
     @Autowired
     private PlatformJobMapper platformJobMapper;
     @Autowired
@@ -192,75 +195,81 @@
     @Override
     @Transactional
     public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list) {
-        if(list ==null || list.getData()==null|| list.getData().size() ==0){
-            return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
-        }
-        List<PlatformJob> jobList = new ArrayList<>();
-        List<PlatformWmsDetail> details = new ArrayList<>();
-        List<String> iocodeList = new ArrayList<>();
-        for(WmsInboundNoticeRequest param : list.getData()){
-            if(StringUtils.isBlank(param.getIoCode()) ||
-                    StringUtils.isBlank(param.getCarrierBillCode())||
-                    StringUtils.isBlank(param.getPlateNumber())||
-                    StringUtils.isBlank(param.getDriverPhone())){
-                return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
+        try{
+            if(list ==null || list.getData()==null|| list.getData().size() ==0){
+                return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
             }
-            //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
-            PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
-                    .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
-                    .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
-                    .last("limit 1" ));
-
-            if(job == null){
-
-                PlatformJob model =dealJobBizInbound(param);
-                job = new PlatformWmsJob();
-                job.setCreateDate(new Date());
-                job.setIsdeleted(Constants.ZERO);
-                job.setIsNew(Constants.ONE);
-                job.setCarryBillCode(param.getCarrierBillCode());
-                job.setIocode(param.getIoCode());
-                job.setCarrierName(param.getCarrierName());
-                job.setPlateNumber(param.getPlateNumber());
-                job.setType(Constants.ONE);
-                job.setIoCreatedate(param.getCreateDate());
-                job.setJobId(model.getId());
-                job.setDriverPhone(param.getDriverPhone());
-                platformWmsJobMapper.insert(job);
-                jobList.add(model);
-            }
-            if(param.getDetails()!=null && param.getDetails().size()>0){
-                for(WmsInboundDetailRequest d :param.getDetails()){
-                    PlatformWmsDetail entity = new PlatformWmsDetail();
-                    entity.setCreateDate(new Date());
-                    entity.setIsdeleted(Constants.ZERO);
-                    entity.setIocode(d.getIoCode());
-                    entity.setJobId(job.getJobId());
-                    entity.setWmsJobId(job.getId());
-                    entity.setIoQty(d.getIoQty());
-                    entity.setStatus(Constants.ZERO);
-                    entity.setRate(d.getRate());
-                    entity.setMaterialName(d.getMaterialName());
-                    entity.setInRepertotyCode(d.getInRepertotyCode());
-                    iocodeList.add(d.getIoCode());
-                    details.add(entity);
+            List<PlatformJob> jobList = new ArrayList<>();
+            List<PlatformWmsDetail> details = new ArrayList<>();
+            List<String> iocodeList = new ArrayList<>();
+            for(WmsInboundNoticeRequest param : list.getData()){
+                if(StringUtils.isBlank(param.getIoCode()) ||
+                        StringUtils.isBlank(param.getCarrierBillCode())||
+                        StringUtils.isBlank(param.getPlateNumber())||
+                        StringUtils.isBlank(param.getDriverPhone())){
+                    return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
                 }
-                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())
-                            .in(PlatformWmsDetail::getIocode,iocodeList)
-                    );
+                //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+                PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+                        .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+                        .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+                        .last("limit 1" ));
+
+                if(job == null){
+                    PlatformJob model =dealJobBizInbound(param);
+                    job = new PlatformWmsJob();
+                    job.setCreateDate(new Date());
+                    job.setIsdeleted(Constants.ZERO);
+                    job.setIsNew(Constants.ONE);
+                    job.setStatus(Constants.ONE);
+                    job.setCarryBillCode(param.getCarrierBillCode());
+                    job.setIocode(param.getIoCode());
+                    job.setCarrierName(param.getCarrierName());
+                    job.setDriverName(param.getDriverName());
+                    job.setPlateNumber(param.getPlateNumber());
+                    job.setType(Constants.ZERO);
+                    job.setIoCreatedate(param.getCreateDate());
+                    job.setJobId(model.getId());
+                    job.setDriverPhone(param.getDriverPhone());
+                    platformWmsJobMapper.insert(job);
+                    jobList.add(model);
+                }
+                if(param.getDetails()!=null && param.getDetails().size()>0){
+                    for(WmsInboundDetailRequest d :param.getDetails()){
+                        PlatformWmsDetail entity = new PlatformWmsDetail();
+                        entity.setCreateDate(new Date());
+                        entity.setIsdeleted(Constants.ZERO);
+                        entity.setIocode(d.getIoCode());
+                        entity.setJobId(job.getJobId());
+                        entity.setWmsJobId(job.getId());
+                        entity.setIoQty(d.getIoQty());
+                        entity.setStatus(Constants.ZERO);
+                        entity.setRate(d.getRate());
+                        entity.setMaterialName(d.getMaterialName());
+                        entity.setInRepertotyCode(d.getInRepertotyCode());
+                        iocodeList.add(d.getIoCode());
+                        details.add(entity);
+                    }
+                    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::getWmsJobId,job.getId())
+                                .in(PlatformWmsDetail::getIocode,iocodeList)
+                        );
+                    }
                 }
             }
-        }
-        if(details.size()>0){
-            platformWmsDetailMapper.insert(details);
-        }
-        if(jobList.size()>0){
-            startEndNoticeToDriver(jobList);
+            if(details.size()>0){
+                platformWmsDetailMapper.insert(details);
+            }
+            if(jobList.size()>0){
+                startEndNoticeToDriver(jobList);
+            }
+        }catch (Exception e){
+            log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+            return returnFailReuslt("涓氬姟澶勭悊寮傚父");
         }
         return returnSuccessReuslt(null);
     }
@@ -277,17 +286,30 @@
         job.setIsdeleted(Constants.ZERO);
         job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
         job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+        job.setBillCode(param.getCarrierBillCode());
+        job.setCarrierName(param.getCarrierName());
+        job.setCarCodeFront(param.getPlateNumber());
+        job.setDrivierPhone(param.getDriverPhone());
+        job.setDriverName(param.getDriverName());
+        //澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
+        dealCarPlatformAndDriverInfo(job,0);
+//        platformJobMapper.insert(job);
+        return job;
+    }
+
+    private void dealCarPlatformAndDriverInfo(PlatformJob job,int type) {
         //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
         Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
-                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+                .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' and b.status in("+
                         Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
                 .lambda()
                 .eq(Cars::getIsdeleted,Constants.ZERO)
                 .eq(Cars::getType,Constants.ONE)
-                .eq(Cars::getCode,param.getPlateNumber()));
+                .eq(Cars::getCode,job.getCarCodeFront()));
         if(car !=null){
             //濡傛灉鏄嚜鏈夌墿娴佽溅
-            job.setType(Constants.platformJobType.zycxh);//鑷湁杞﹀嵏璐�
+            job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣
+            job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍�
             if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
                 //濡傛灉杞﹁締鍦ㄥ洯
                 job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
@@ -295,44 +317,39 @@
         }
         PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
                 .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
-                .eq(PlatformGroup::getType,Constants.ONE)
+                .eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE)
                 .last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
         job.setPlatformGroupId(group!=null?group.getId():null);
+        Member driver =  memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+                .selectAll(Member.class)
+                .selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath)
+                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+                .eq(Member::getIsdeleted,Constants.ZERO)
+                .eq(Member::getPhone,job.getDrivierPhone())
+                .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
+        if(driver!=null){
+            job.setDriverId(driver.getId());
+            job.setCompanyId(driver.getCompanyId());
+            job.setCompanyNamePath(driver.getCompanyNamePath());
+        }
         platformJobMapper.insert(job);
-        return job;
     }
+
     private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {
         PlatformJob job = new PlatformJob();
         job.setCreateDate(new Date());
         job.setIsdeleted(Constants.ZERO);
         job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
         job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
-        //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
-        Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
-                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
-                        Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
-                .lambda()
-                .eq(Cars::getIsdeleted,Constants.ZERO)
-                .eq(Cars::getType,Constants.ONE)
-                .eq(Cars::getCode,param.getPlateNumber()));
-        if(car !=null){
-            //濡傛灉鏄嚜鏈夌墿娴佽溅
-            job.setType(Constants.platformJobType.zyczh);//鑷湁杞﹁璐�
-            if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
-                //濡傛灉杞﹁締鍦ㄥ洯
-                job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
-            }
-        }
-        PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
-                .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
-                .eq(PlatformGroup::getType,Constants.ZERO)
-                .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
-        job.setPlatformGroupId(group!=null?group.getId():null);
-        platformJobMapper.insert(job);
+        job.setBillCode(param.getCarrierBillCode());
+        job.setCarrierName(param.getCarrierName());
+        job.setCarCodeFront(param.getPlateNumber());
+        job.setDrivierPhone(param.getDriverPhone());
+        job.setDriverName(param.getDriverName());
+        //澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
+        dealCarPlatformAndDriverInfo(job,1);
         return job;
     }
-
-
     /**
      * 鍑哄簱閫氱煡浠诲姟涓氬姟澶勭悊
      * @param list 鍙傛暟
@@ -340,73 +357,85 @@
      */
     @Override
     public WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list) {
-        if(list ==null ||list.getData()==null ||  list.getData().size() ==0){
-            return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
-        }
-        List<PlatformJob> jobList = new ArrayList<>();
-        List<PlatformWmsDetail> details = new ArrayList<>();
-        List<String> iocodeList = new ArrayList<>();
-        for(WmsOutboundNoticeRequest param : list.getData()){
-            if(StringUtils.isBlank(param.getIoCode()) ||
-                    StringUtils.isBlank(param.getCarrierBillCode())||
-                    StringUtils.isBlank(param.getPlateNumber())||
-                    StringUtils.isBlank(param.getDriverPhone())){
-                return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
-            }
-            //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
-            PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
-                    .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
-                    .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
-                    .last("limit 1" ));
 
-            if(job == null){
-                PlatformJob model =dealJobBizOutbound(param);
-                job = new PlatformWmsJob();
-                job.setCreateDate(new Date());
-                job.setIsdeleted(Constants.ZERO);
-                job.setIsNew(Constants.ONE);
-                job.setCarryBillCode(param.getCarrierBillCode());
-                job.setIocode(param.getIoCode());
-                job.setCarrierName(param.getCarrierName());
-                job.setPlateNumber(param.getPlateNumber());
-                job.setType(Constants.ONE);
-                job.setIoCreatedate(param.getCreateDate());
-                job.setJobId(job.getId());
-                job.setDriverPhone(param.getDriverPhone());
-                platformWmsJobMapper.insert(job);
-                jobList.add(model);
+        try{
+            if(list ==null ||list.getData()==null ||  list.getData().size() ==0){
+                return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
             }
-            if(param.getDetails()!=null && param.getDetails().size()>0){
-                for(WmsOutboundDetailRequest d :param.getDetails()){
-                    PlatformWmsDetail entity = new PlatformWmsDetail();
-                    entity.setCreateDate(new Date());
-                    entity.setIsdeleted(Constants.ZERO);
-                    entity.setIocode(d.getIoCode());
-                    entity.setJobId(job.getJobId());
-                    entity.setWmsJobId(job.getId());
-                    entity.setIoQty(d.getIoQty());
-                    entity.setStatus(Constants.ZERO);
-                    entity.setRate(d.getRate());
-                    entity.setMaterialName(d.getMaterialName());
-                    iocodeList.add(d.getIoCode());
-                    details.add(entity);
+            List<PlatformJob> jobList = new ArrayList<>();
+            List<PlatformWmsDetail> details = new ArrayList<>();
+            List<String> iocodeList = new ArrayList<>();
+            for(WmsOutboundNoticeRequest param : list.getData()){
+                if(StringUtils.isBlank(param.getIoCode()) ||
+                        StringUtils.isBlank(param.getCarrierBillCode())||
+                        StringUtils.isBlank(param.getPlateNumber())||
+                        StringUtils.isBlank(param.getDriverPhone())){
+                    return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
                 }
-                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())
-                            .in(PlatformWmsDetail::getIocode,iocodeList)
-                    );
+                //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+                PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+                        .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+                        .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+                        .last("limit 1" ));
+
+                if(job == null){
+                    PlatformJob model =dealJobBizOutbound(param);
+                    job = new PlatformWmsJob();
+                    job.setCreateDate(new Date());
+                    job.setIsdeleted(Constants.ZERO);
+                    job.setStatus(Constants.ZERO);
+                    job.setIsNew(Constants.ONE);
+                    job.setCarryBillCode(param.getCarrierBillCode());
+                    job.setIocode(param.getIoCode());
+                    job.setCarrierName(param.getCarrierName());
+                    job.setPlateNumber(param.getPlateNumber());
+                    job.setDriverName(param.getDriverName());
+                    job.setType(Constants.ONE);
+                    job.setIoCreatedate(param.getCreateDate());
+                    job.setJobId(model.getId());
+                    job.setRepertotyAddress(param.getRepertotyAddress());
+                    job.setContractNum(param.getContractNum());
+                    job.setDriverPhone(param.getDriverPhone());
+                    job.setDriverName(param.getDriverName());
+                    platformWmsJobMapper.insert(job);
+                    jobList.add(model);
+                }
+                if(param.getDetails()!=null && param.getDetails().size()>0){
+                    for(WmsOutboundDetailRequest d :param.getDetails()){
+                        PlatformWmsDetail entity = new PlatformWmsDetail();
+                        entity.setCreateDate(new Date());
+                        entity.setIsdeleted(Constants.ZERO);
+                        entity.setIocode(d.getIoCode());
+                        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){
+                        //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
+                        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+                                .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
+                                .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+                                .eq(PlatformWmsDetail::getWmsJobId,job.getId())
+                                .in(PlatformWmsDetail::getIocode,iocodeList)
+                        );
+                    }
                 }
             }
-        }
-        if(details.size()>0){
-            platformWmsDetailMapper.insert(details);
-        }
-        if(jobList.size()>0){
-            startEndNoticeToDriver(jobList);
+            if(details.size()>0){
+                platformWmsDetailMapper.insert(details);
+            }
+            if(jobList.size()>0){
+                startEndNoticeToDriver(jobList);
+            }
+        }catch (Exception e){
+            log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+            return returnFailReuslt("涓氬姟澶勭悊寮傚父");
         }
         return returnSuccessReuslt(null);
     }
@@ -417,9 +446,28 @@
      */
     @Override
     public WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
-        //TODO-------------------澶勭悊鍏ュ簱鍙栨秷閫氱煡涓氬姟--------------------
-        if(list ==null||list.getData()==null || list.getData().size() ==0){
-            return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+        //-----------------澶勭悊鍏ュ簱鍙栨秷閫氱煡涓氬姟--------------------
+        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("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+            return returnFailReuslt("涓氬姟澶勭悊寮傚父");
         }
         return returnSuccessReuslt(null);
     }
@@ -430,18 +478,28 @@
      */
     @Override
     public WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
-        if(list ==null||list.getData()==null || list.getData().size() ==0){
-            return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+        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("銆怶MS銆戝嚭搴撳彇娑堥�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+            return returnFailReuslt("涓氬姟澶勭悊寮傚父");
         }
-        List<String> iocodeList = new ArrayList<>();
-        for(WmsActionNoticeRequest param :list.getData()){
-            iocodeList.add(param.getIoCode());
-        }
-        //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
-         platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
-                .set(PlatformWmsDetail::getStatus,Constants.TWO)
-                .in(PlatformWmsDetail::getIocode,iocodeList)
-                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
         return returnSuccessReuslt(null);
     }
     /**
@@ -451,19 +509,28 @@
      */
     @Override
     public WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list) {
-        if(list ==null||list.getData()==null || list.getData().size() ==0){
-            return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+        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("銆怶MS銆戜綔涓氬畬鎴愰�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+            return returnFailReuslt("涓氬姟澶勭悊寮傚父");
         }
-        List<String> iocodeList = new ArrayList<>();
-        for(WmsActionNoticeRequest param :list.getData()){
-            iocodeList.add(param.getIoCode());
-        }
-        //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
-        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
-                .set(PlatformWmsDetail::getStatus,Constants.ONE)
-                .in(PlatformWmsDetail::getIocode,iocodeList)
-                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
-
         return returnSuccessReuslt(null);
     }
 
@@ -475,6 +542,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 +559,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,"鎿嶄綔鎴愬姛"));

--
Gitblit v1.9.3