From 6e69b1b199d05361dd9038ae952aef4ea8f2a5b0 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 15:13:02 +0800
Subject: [PATCH] lsh#单据接收
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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..74026e1 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,8 +1,8 @@
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.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,6 @@
private AgvService agvService;
@ApiOperation("绔欑偣缁戝畾鏌ヨ")
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/staBind/list")
public R getStaBindList(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -34,17 +33,24 @@
return agvService.getStaBindList(params);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
- @ApiOperation("绔欑偣缁戝畾")
- @PostMapping("/AGV/staBind")
- public R getAGVStaBind(@RequestBody Map<String, Object> params) {
+ @ApiOperation("绔欑偣鏌ヨ")
+ @PostMapping("/staMsg/select")
+ public R getStaMsgSelect(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return agvService.getAGVStaBind(params);
+ 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);
+ }
+
@ApiOperation("绔欑偣瑙ｇ粦")
@PostMapping("/AGV/staUnBind")
public R getAGVStaUnBind(@RequestBody Map<String, Object> params) {
@@ -54,13 +60,21 @@
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)) {
+ public R AGVInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
+ if (Objects.isNull(waitPakinPda)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return agvService.AGVInTaskStart(params, getLoginUserId());
+ return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
+ }
+
+ @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