From 871a5789eedf93d21f16bc7f619c5edb7da70f46 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 25 十一月 2024 16:02:23 +0800
Subject: [PATCH] 新增重新下发堆垛机任务
---
src/main/webapp/views/taskWrk/taskWrk.html | 39 +++++++++++++++++--
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 23 +++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index df10756..e9a44f2 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -247,6 +247,29 @@
return R.ok();
}
+ @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+ @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+ public R returnWorkingCondition(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(11);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ }else{
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
+ }
+
@PostMapping(value = "/taskWrk/cancel/auth")
@ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
public R cancel(@RequestParam String taskNo) {
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index befd375..1fa0044 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -52,7 +52,8 @@
<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
<el-button icon="el-icon-more" size="mini" type="primary"></el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>
+<!-- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+ <el-dropdown-item command="returnWorkingCondition">閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟</el-dropdown-item>
<el-dropdown-item command="changeCommand">淇敼</el-dropdown-item>
<el-dropdown-item command="assign">娲惧彂</el-dropdown-item>
<el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
@@ -205,9 +206,9 @@
},
handleCommand(command, row) {
switch (command) {
- case "showCommand":
- //鏌ョ湅鎸囦护
- this.showCommand(row)
+ case "returnWorkingCondition":
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ this.returnWorkingConditionWrk(row)
break;
case "changeCommand":
//淇敼鎸囦护
@@ -306,6 +307,36 @@
}
});
},
+ returnWorkingConditionWrk(row){
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/returnWorkingCondition/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鍙栨秷鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
cancelWrk(row){
//鍙栨秷浠诲姟
let that = this
--
Gitblit v1.9.1