From 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 07 六月 2021 11:10:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/WorkController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index ec04118..ff968e0 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -29,6 +29,12 @@
@Autowired
private BasDevpService basDevpService;
+ @RequestMapping("/agv/put/site")
+ @ManagerAuth(memo = "鑾峰彇AGV宸ヤ綔鍖�")
+ public R availableAgvSite(){
+ return R.ok().add(basDevpService.getAgvAvailableInSite());
+ }
+
@RequestMapping("/available/put/site")
@ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
public R availablePutSite(){
@@ -59,6 +65,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