From 6bd673610b45c8b7af056d296dde17585c886586 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 17:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 ddf50fd..1a0d1ad 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,9 +108,20 @@
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()
+ if(Objects.isNull(wmsJobContractVO.getLockStatus())&&
+ 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
+ );
+ }else{
+ wmsJobContractVO.setLockStatus(
+ wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus()
+ );
+ }
+ }
+ wmsJobContractVO.setStatus(
+ wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getStatus()
);
}
wmsJobContractVOList.add(wmsJobContractVO);
--
Gitblit v1.9.3