From 0b232db982fd452c805e0c823416c106fe63b4ca Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 23 十月 2024 15:13:59 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 141a91f..5249ea2 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -23,6 +23,7 @@ import com.zy.core.thread.RgvThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,6 +45,9 @@ private WrkMastService wrkMastService; @Autowired private BasDevpPositionService basDevpPositionService; + + @Value("${constant-parameters.perimeter}") + private Long perimeter; @Override @Transactional @@ -93,7 +97,7 @@ wcsRgvListParam.setRgvNo(rgv.getId().toString()); wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString()); wcsRgvListParam.setStatus(rgvProtocol.statusType.desc); - wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos()).toString()); + wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString()); List<String> arrayList = new ArrayList<>(); if (rgvProtocol.getAlarm()!=0){ arrayList.add(rgvProtocol.getAlarm$()); -- Gitblit v1.9.1