From 78f44737c296af3e970de6f0f8ef2477697ee829 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 15:43:31 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 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..843895c 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
@@ -2,6 +2,7 @@
 
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.server.api.service.AgvService;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,23 +24,63 @@
     @Autowired
     private AgvService agvService;
 
+    @ApiOperation("绔欑偣缁戝畾鏌ヨ")
     @PreAuthorize("hasAuthority('manager:basStation:list')")
-    @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
-    @PostMapping("/AGV/staBind")
-    public R getAGVStaBind(@RequestBody Map<String, Object> params) {
+    @PostMapping("/staBind/list")
+    public R getStaBindList(@RequestBody Map<String, Object> params) {
         if (Objects.isNull(params)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return agvService.getAGVStaBind(params);
+        return agvService.getStaBindList(params);
     }
 
-    @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
-    @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+    @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 WaitPakinParam waitPakinPda) {
+        if (Objects.isNull(waitPakinPda)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return agvService.getAGVStaBind(waitPakinPda);
+    }
+
+    @PreAuthorize("hasAuthority('manager:basStation:list')")
+    @ApiOperation("绔欑偣瑙g粦")
     @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 WaitPakinParam waitPakinPda) {
+        if (Objects.isNull(waitPakinPda)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
+    }
+
+    @PreAuthorize("hasAuthority('manager:basStation:list')")
+    @ApiOperation("AGV缁戝畾&鍏ュ簱")
+    @PostMapping("/AGV/bindAndIn/start")
+    public R AGVBindAndInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
+        if (Objects.isNull(waitPakinPda)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return agvService.AGVBindAndInTaskStart(waitPakinPda, getLoginUserId());
     }
 }

--
Gitblit v1.9.1