From 288f3d62008d7c68c36f7df3ff0a30efc5ca9459 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 27 十二月 2023 09:21:05 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index 9be10c3..e4750ef 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -32,21 +32,28 @@
@RequestMapping("/available/put/site")
@ManagerAuth()
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableInSite());
+ return R.ok().add(basDevpService.getAvailableInSite(getHostId()));
+ }
+
+ @RequestMapping("/available/empty/put/site")
+ @ManagerAuth()
+ public R availableEmptyPutSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyInSite(getHostId()));
}
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
+ Long hostId = getHostId();
List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101, hostId);
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
result.add(map);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103, hostId);
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
@@ -56,4 +63,10 @@
return R.ok().add(result);
}
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth()
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(107, getHostId()));
+ }
+
}
--
Gitblit v1.9.1