From e86a2c87241c861a416955b3728a3bbe40ed224c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 17:16:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 4dca465..86f0f0f 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -76,7 +76,7 @@
}
@PostMapping("/run/del")//Take Put Walk
- @ManagerAuth(memo = "灏忚溅琛岃蛋")
+ @ManagerAuth(memo = "娓呯┖浠诲姟")
public R rgvRunDel(@RequestParam(defaultValue = "0") Integer rgvNo
) {
if (rgvNo==null || rgvNo==0){
@@ -101,15 +101,12 @@
@PostMapping("/run/walk")//Take Put Walk
@ManagerAuth(memo = "灏忚溅琛岃蛋")
public R rgvRunWalk(@RequestParam(defaultValue = "0") Integer rgvNo,
- @RequestParam(defaultValue = "0") Integer taskNo,
+ @RequestParam(defaultValue = "9999") Integer taskNo,
@RequestParam(defaultValue = "0") Integer rgvStaNoPut,
@RequestParam(defaultValue = "0") Long rgvPosDestination
) {
if (rgvNo==null || rgvNo==0){
return R.error("璇烽�夋嫨灏忚溅");
- }
- if (taskNo==null || taskNo==0){
- return R.error("浣滀笟鍙疯濉啓");
}
if ((rgvStaNoPut == null || rgvStaNoPut == 0) && (rgvPosDestination==null || rgvPosDestination==0L)){
return R.error("鐩爣绔欑偣璇峰～鍐�");
@@ -149,15 +146,12 @@
@PostMapping("/run/put")//Take Put Walk
@ManagerAuth(memo = "灏忚溅鏀捐揣")
public R rgvPutWalk(@RequestParam(defaultValue = "0") Integer rgvNo,
- @RequestParam(defaultValue = "0") Integer taskNo,
+ @RequestParam(defaultValue = "9999") Integer taskNo,
@RequestParam(defaultValue = "0") Integer rgvStaNoPut,
@RequestParam(defaultValue = "0") Long rgvPosDestination
) {
if (rgvNo==null || rgvNo==0){
return R.error("璇烽�夋嫨灏忚溅");
- }
- if (taskNo==null || taskNo==0){
- return R.error("浣滀笟鍙疯濉啓");
}
if (rgvStaNoPut == null || rgvStaNoPut == 0){
return R.error("鐩爣绔欑偣璇峰～鍐�");
@@ -177,6 +171,8 @@
//鎵ц
issuedPut.setTaskNo(Long.valueOf(taskNo));
issuedPut.setTaskStatus(3);
+ issuedPut.setTargetPositionStaNo(basDevpPosition.getDevNo());
+ issuedPut.setTargetPositionStaNoPlcId(basDevpPosition.getPlcId());
issuedPut.setTaskNoDirection(issuedPut.gettaskNoDirection$(issuedPut.getTaskNo(), issuedPut.getTaskStatus()));
issuedPut.setTargetPosition(basDevpPosition.getPlcPosition());
issuedPut.setIsRunning(1);
@@ -193,15 +189,12 @@
@PostMapping("/run/take")//Take Put Walk
@ManagerAuth(memo = "灏忚溅鍙栬揣")
public R rgvTakeWalk(@RequestParam(defaultValue = "0") Integer rgvNo,
- @RequestParam(defaultValue = "0") Integer taskNo,
+ @RequestParam(defaultValue = "9999") Integer taskNo,
@RequestParam(defaultValue = "0") Integer rgvStaNoTake,
@RequestParam(defaultValue = "0") Long rgvPosDestination
) {
if (rgvNo==null || rgvNo==0){
return R.error("璇烽�夋嫨灏忚溅");
- }
- if (taskNo==null || taskNo==0){
- return R.error("浣滀笟鍙疯濉啓");
}
if (rgvStaNoTake == null || rgvStaNoTake == 0){
return R.error("鍙栬揣绔欑偣璇峰～鍐�");
@@ -236,16 +229,13 @@
@PostMapping("/run/TakeAndPut")//Take Put Walk
@ManagerAuth(memo = "灏忚溅鍙栬揣")
public R rgvTakeAndPut(@RequestParam(defaultValue = "0") Integer rgvNo,
- @RequestParam(defaultValue = "0") Integer taskNo,
+ @RequestParam(defaultValue = "9999") Integer taskNo,
@RequestParam(defaultValue = "0") Integer rgvStaNoTake,
@RequestParam(defaultValue = "0") Integer rgvStaNoPut,
@RequestParam(defaultValue = "0") Long rgvPosDestination
) {
if (rgvNo==null || rgvNo==0){
return R.error("璇烽�夋嫨灏忚溅");
- }
- if (taskNo==null || taskNo==0){
- return R.error("浣滀笟鍙疯濉啓");
}
if (rgvStaNoTake == null || rgvStaNoTake == 0){
return R.error("鍙栬揣绔欑偣璇峰～鍐�");
@@ -268,6 +258,8 @@
//鎵ц
issuedTake.setTaskNo(Long.valueOf(taskNo));
issuedTake.setTaskStatus(2);
+ issuedTake.setTargetPositionStaNo(basDevpPositionTake.getDevNo());
+ issuedTake.setTargetPositionStaNoPlcId(basDevpPositionTake.getPlcId());
issuedTake.setTaskNoDirection(issuedTake.gettaskNoDirection$(issuedTake.getTaskNo(), issuedTake.getTaskStatus()));
issuedTake.setTargetPosition(basDevpPositionTake.getPlcPosition());
issuedTake.setIsRunning(1);
@@ -277,6 +269,8 @@
//鎵ц
issuedPut.setTaskNo(Long.valueOf(taskNo));
issuedPut.setTaskStatus(3);
+ issuedPut.setTargetPositionStaNo(basDevpPositionPut.getDevNo());
+ issuedPut.setTargetPositionStaNoPlcId(basDevpPositionPut.getPlcId());
issuedPut.setTaskNoDirection(issuedPut.gettaskNoDirection$(issuedPut.getTaskNo(), issuedPut.getTaskStatus()));
issuedPut.setTargetPosition(basDevpPositionPut.getPlcPosition());
issuedPut.setIsRunning(1);
@@ -291,4 +285,22 @@
return R.ok("浠诲姟鐢熸垚鎴愬姛");
}
+
+ @PostMapping("/run/delRgvTask")//Take Put Walk
+ @ManagerAuth(memo = "灏忚溅鍙栬揣")
+ public R rgvDelRgvTask(@RequestParam(defaultValue = "0") Integer rgvNo
+ ) {
+ if (rgvNo==null || rgvNo==0){
+ return R.error("璇烽�夋嫨灏忚溅");
+ }
+
+ try {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
+ rgvThread.setDelRgvTask();
+ } catch (Exception e) {
+ return R.error("浠诲姟鐢熸垚澶辫触"+e.getMessage());
+ }
+
+ return R.ok("浠诲姟鐢熸垚鎴愬姛");
+ }
}
--
Gitblit v1.9.1