From dd3e73b101fec95d7277c93d0ab75c266a22e0e4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 16:01:24 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 23 +++++++++--
src/main/webapp/views/index.html | 50 +++++++++++++++++++++----
2 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 639cbd7..bf121b5 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -40,10 +40,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.rmi.CORBA.Util;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* RGV鎺ュ彛
@@ -475,13 +472,29 @@
@PostMapping("/disable/rgv/status")
-// @ManagerAuth(memo = "浣滀笟淇℃伅")
+// @ManagerAuth(memo = "淇敼RGV鐘舵��")
public R rgvDisableStatus(@RequestParam Integer rgvId,
@RequestParam Integer status){
+ log.info("/disable/rgv/status===銆嬩慨鏀筊GV鐘舵�侊紒锛侊紒rgvId:{},status:{},data:{}",rgvId,status,new Date());
BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
+ if (basCircularShuttle == null){
+ return R.error().add("鏈壘鍒版RGV锛屽紓甯革紒锛侊紒");
+ }
basCircularShuttle.setStatus(status);
basCircularShuttleService.updateById(basCircularShuttle);
return R.ok();
}
+ @PostMapping("/disable/task/delete")
+// @ManagerAuth(memo = "鍒犻櫎浠诲姟")
+ public R taskDisabledelete(@RequestParam Long wrkNo){
+ log.info("/disable/task/delete===銆嬪垹闄や换鍔★紒锛侊紒wrkNo:{},data:{}",wrkNo,new Date());
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Cools.isEmpty(wrkMast)){
+ return R.error().add("鏈壘鍒版浠诲姟锛屽紓甯革紒锛侊紒");
+ }
+ wrkMastService.deleteById(wrkMast);
+ return R.ok();
+ }
+
}
\ No newline at end of file
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 78ab26d..765a86c 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -294,11 +294,18 @@
prop="rgvSts"
label="RGV鐘舵��">
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop=""-->
-<!-- label="鎿嶄綔">-->
-<!-- <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
-<!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ type="template">
+ <template slot-scope="scope">
+ <el-button
+ type="danger"
+ size="small"
+ @click="taskDelete(scope.row)">
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
@@ -451,11 +458,38 @@
}
}
},
+ taskDelete(row) {
+ let that = this;
+ that.$confirm('纭瑕佸垹闄よ璁惧鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/task/delete",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ wrkNo: row.wrkNo
+ },
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message.success('鍒犻櫎鎴愬姛');
+ // 鍒犻櫎褰撳墠琛�
+ that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
+ } else {
+ that.$message.error('鍒犻櫎澶辫触');
+ }
+ }
+ });
+ });
+ },
toggleStatus(index, row) {
+ let that = this;
const currentStatus = row.status;
const targetStatus = currentStatus === 0 ? 1 : 0;
- this.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
+ that.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -470,10 +504,10 @@
},
success: function (res) {
if (res.code === 200) {
- this.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
+ that.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
row.status$ = targetStatus; // 鏇存柊鍓嶇鐘舵��
} else {
- this.$message.error('鐘舵�佹洿鏂板け璐�');
+ that.$message.error('鐘舵�佹洿鏂板け璐�');
}
}
});
--
Gitblit v1.9.1