From b0c4a1ff9d2df09c137807e9c38c43bf9a097237 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 07 一月 2025 09:16:21 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 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 1aa81ba..16ef858 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 @@ -2,8 +2,8 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.PlatformWmsDetailMapper; @@ -110,12 +110,19 @@ ); 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() - ); + 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