From 0ac91de9a20e6e6afaa0a37359630b001919682e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 六月 2021 14:56:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 34d71da..7e99e9e 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -44,7 +44,9 @@
@RequestMapping("/available/empty/put/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
public R availableEmptyPutSite(){
- return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ List<Integer> availableEmptyInSite = basDevpService.getAgvAvailableInSite();
+ availableEmptyInSite.addAll(basDevpService.getAvailableEmptyInSite());
+ return R.ok().add(availableEmptyInSite);
}
@RequestMapping("/available/take/site")
@@ -65,6 +67,13 @@
map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
result.add(map);
}
+ List<Integer> agvAvailableInSite = basDevpService.getAgvAvailableInSite();
+ for (Integer siteId : agvAvailableInSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝皬杞﹀伐浣滃尯锛�");
+ result.add(map);
+ }
return R.ok().add(result);
}
--
Gitblit v1.9.1