From 1e83a71a2b73dcc62ca5acd246c11c1d35068b8b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 10 六月 2025 10:06:37 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java index 9dbe3a6..1f540a2 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java @@ -1678,28 +1678,34 @@ Date date = new Date(); List<String> codeList =new ArrayList<>(); for(PlatformWmsDetail d : details){ - codeList.add(d.getContractNum()); + if(StringUtils.isNotBlank(d.getContractNum())){ + if(StringUtils.isNotBlank(d.getContractNum())){ + codeList.add(d.getContractNum()); + } + } } - TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); - tmsLock.setContractNumbers(codeList); List<Integer> jobIds = new ArrayList<>(); - TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); - if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){ - for(TmsLockStatusQueryResponse s : lockResult.getData()){ - try { - //寮傚父澶勭悊锛岃兘澶勭悊涓�涓槸涓�涓� - platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() - .eq(PlatformWmsDetail::getContractNum,s.getContractNumber()) - .set(PlatformWmsDetail::getEditDate,date) - .set(PlatformWmsDetail::getLockDate,s.getOutDate()) - .set(PlatformWmsDetail::getLockStatus,Constants.ONE) - .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); - PlatformWmsDetail job = getJobByContractnumFromDetail(s.getContractNumber(),details); - if(job != null){ - jobIds.add(job.getJobId()); + if(codeList.size()>0){ + TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); + tmsLock.setContractNumbers(codeList); + TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); + if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){ + for(TmsLockStatusQueryResponse s : lockResult.getData()){ + try { + //寮傚父澶勭悊锛岃兘澶勭悊涓�涓槸涓�涓� + platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() + .eq(PlatformWmsDetail::getContractNum,s.getContractNumber()) + .set(PlatformWmsDetail::getEditDate,date) + .set(PlatformWmsDetail::getLockDate,s.getOutDate()) + .set(PlatformWmsDetail::getLockStatus,Constants.ONE) + .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); + PlatformWmsDetail job = getJobByContractnumFromDetail(s.getContractNumber(),details); + if(job != null){ + jobIds.add(job.getJobId()); + } + }catch (Exception e){ + logger.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage()); } - }catch (Exception e){ - logger.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage()); } } } @@ -2450,7 +2456,6 @@ .in(PlatformJob::getId,jobIdList) ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){ - platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() .set(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()) .set(PlatformJob::getDoneDate,new Date()) -- Gitblit v1.9.3