From a35b8eec96aac2793de732c3fb7513cd6c5b2e4c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 08 一月 2025 14:39:34 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 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..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; @@ -108,6 +108,22 @@ 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())){ + 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