From b801ccf0a01277b0796ee6f822346836e33de148 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 14:55:46 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 8f88216..0448530 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -229,7 +230,10 @@
public List<AgvBasDevp> getAgvBasDevpByFloor(int floor) {
EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>();
wrapper.eq("floor",floor).eq("cache_shelves","Y").eq("loc_sts","F");
- return agvBasDevpService.selectList(wrapper);
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(wrapper);
+ return agvBasDevpList.stream().filter(agvBasDevp -> {
+ return !Cools.isEmpty(agvWaitPakinService.selectByContainerCode(agvBasDevp.getBarcode()));
+ }).collect(Collectors.toList());
}
}
--
Gitblit v1.9.1