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 | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 f436604..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
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.controller.params.OpStockParams;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -23,8 +24,28 @@
@Autowired
private AgvService agvService;
+ @ApiOperation("绔欑偣缁戝畾鏌ヨ")
@PreAuthorize("hasAuthority('manager:basStation:list')")
- @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+ @PostMapping("/staBind/list")
+ public R getStaBindList(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ 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")
public R getAGVStaBind(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -33,13 +54,33 @@
return agvService.getAGVStaBind(params);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
- @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+ @PreAuthorize("hasAuthority('manager:basStation:list')")
+ @ApiOperation("绔欑偣瑙ｇ粦")
@PostMapping("/AGV/staUnBind")
public R getAGVStaUnBind(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return agvService.getAGVStaBind(params);
+ return agvService.AGVStaUnBind(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:basStation:list')")
+ @ApiOperation("AGV鍚姩鍏ュ簱")
+ @PostMapping("/AGV/task/start")
+ public R AGVInTaskStart(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ 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