From c50686f775664c5a722f4b5ad7afde1e5214b14d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十一月 2024 19:07:21 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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..b17522e 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,10 +108,21 @@
                 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