From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 10:28:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
index 54ffa2d..3d54034 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -49,9 +49,19 @@
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
- workService.cancelWrkMast(workNo, getUserId());
+ workService.cancelWrkMast(workNo, getUserId(),2);
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 5) {
+ workService.cancelWrkMast(workNo, getUserId(),5);
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
}
return R.ok();
}
+
+ @RequestMapping("/hand/control/wrkMast/changeType")
+ @ManagerAuth(memo = "鍒囨崲璋冩嫧鏂瑰紡")
+ public R handControlWrkMastChangeType(@RequestParam String workNo){
+ workService.changeType(workNo, getUserId());
+ return R.ok();
+ }
}
--
Gitblit v1.9.1