From bf79a36667124868583fcbf47af0e709e088b5e9 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 12 十月 2024 09:09:32 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java index f16a52d..6244579 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java @@ -108,6 +108,14 @@ wmsJobContractVO.setPlatformWmsDetailList( platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList()) ); + if(Objects.isNull(wmsJobContractVO.getLockStatus())&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){ + wmsJobContractVO.setLockStatus( + wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus() + ); + wmsJobContractVO.setStatus( + wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getStatus() + ); + } wmsJobContractVOList.add(wmsJobContractVO); } -- Gitblit v1.9.3