From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
index e4e8939..f244c17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -34,6 +34,16 @@
return agvService.getStaBindList(params);
}
+ @ApiOperation("绔欑偣鏌ヨ")
+ @PreAuthorize("hasAuthority('manager:basStation:list')")
+ @PostMapping("/staMsg/select")
+ public R getStaMsgSelect(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return agvService.getStaMsgSelect(params);
+ }
+
@PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("绔欑偣缁戝畾")
@PostMapping("/AGV/staBind")
@@ -63,4 +73,14 @@
}
return agvService.AGVInTaskStart(params, getLoginUserId());
}
+
+ @PreAuthorize("hasAuthority('manager:basStation:list')")
+ @ApiOperation("AGV缁戝畾&鍏ュ簱")
+ @PostMapping("/AGV/bindAndIn/start")
+ public R AGVBindAndInTaskStart(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return agvService.AGVBindAndInTaskStart(params, getLoginUserId());
+ }
}
--
Gitblit v1.9.1