From ddc9842f99172338bd7606de3c9a8cf520d7a0b4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 09:55:48 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrk/taskWrk.html | 37 ++++++++++++++++++
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 1
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 2 +
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 26 +++++++++++-
src/main/java/com/zy/asrs/service/TaskWrkService.java | 1
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 4 ++
src/main/resources/mapper/TaskWrkMapper.xml | 3 +
7 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 04a0a73..78f28ef 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -121,10 +121,30 @@
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- taskWrkService.deleteById(id);
+ public R delete(@RequestParam String taskNo){
+// for (Long id : ids){
+// taskWrkService.deleteById(id);
+// }
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error();
}
+ Date now = new Date();
+ taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
+ taskWrk.setModiTime(now);
+ taskWrk.setModiUser(getUserId());
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error("鍒犻櫎澶辫触" + taskWrk);
+ return R.error("鍒犻櫎澶辫触" + taskWrk);
+
+ }
+ if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return R.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+
+ }
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 1a70e31..fd058b7 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -37,6 +37,7 @@
List<TaskWrk> selectToBeHistoryData();
int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+ int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
List<TaskWrk> selectWorkingTask();//鑾峰彇宸ヤ綔涓殑浠诲姟
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index e62ee0b..1081462 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -29,5 +29,6 @@
List<TaskWrk> selectToBeHistoryData();
int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+ int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index bd3c01b..0ad75d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -247,4 +247,8 @@
public int saveToHistory(String taskNo) {
return this.baseMapper.saveToHistory(taskNo);
}
+ @Override
+ public int saveToHistoryD(String taskNo) {
+ return this.baseMapper.saveToHistoryD(taskNo);
+ }
}
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 8c6800e..1fadd87 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -125,6 +125,9 @@
<insert id="saveToHistory">
insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4 or status=6)
</insert>
+ <insert id="saveToHistoryD">
+ insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo}
+ </insert>
<select id="selectWorkingTask" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index a0887f2..8f5e380 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -58,6 +58,7 @@
<el-dropdown-item command="assign">娲惧彂</el-dropdown-item>
<el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
<el-dropdown-item command="cancel">鍙栨秷</el-dropdown-item>
+ <el-dropdown-item command="delete">鍒犻櫎涓嶄笂鎶�</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -85,6 +86,8 @@
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
<el-table-column property="ioPri" label="浼樺厛绾�">
+ </el-table-column>
+ <el-table-column property="memo" label="澶囨敞">
</el-table-column>
</el-table>
@@ -231,6 +234,10 @@
//鍙栨秷浠诲姟
this.cancelWrk(row)
break;
+ case "delete":
+ //鍙栨秷浠诲姟
+ this.deleteWrk(row)
+ break;
}
},
showCommand(row) {
@@ -343,6 +350,36 @@
}
});
},
+ deleteWrk(row) {
+ //鍙栨秷浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/delete/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
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index f074191..8152575 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -71,6 +71,8 @@
</el-table-column>
<el-table-column property="barcode" label="鏉＄爜">
</el-table-column>
+ <el-table-column property="memo" label="澶囨敞">
+ </el-table-column>
</el-table>
<div style="margin-top: 10px;">
--
Gitblit v1.9.1