From a073250f6f4f8c32888bc60b24ff6984e29af51e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 01 八月 2024 17:04:01 +0800
Subject: [PATCH] #增加弃车功能
---
src/main/webapp/views/wrkMast/wrkMast.html | 1 +
src/main/java/com/zy/asrs/entity/WrkMast.java | 3 ++-
src/main/webapp/static/js/wrkMast/wrkMast.js | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/controller/WrkMastController.java | 20 ++++++++++++++++++++
4 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 1d4ff1f..79be77c 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -15,6 +15,7 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -245,5 +246,24 @@
return R.ok();
}
+ @GetMapping(value = "/wrkMast/removeShuttle/{wrkNo}")
+ @ManagerAuth(memo = "寮冭溅")
+ public R redPri(@PathVariable Integer wrkNo) {
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast == null) {
+ return R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+
+ if (wrkMast.getShuttleNo() == null) {
+ return R.error("宸ヤ綔妗ｆ棤灏忚溅");
+ }
+
+ wrkMast.setShuttleNo(null);
+ if (!wrkMastService.updateById(wrkMast)) {
+ return R.error("寮冭溅澶辫触");
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index eb9c34b..2ed4884 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
@@ -69,7 +70,7 @@
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("shuttle_no")
+ @TableField(value = "shuttle_no",strategy = FieldStrategy.IGNORED)
private Integer shuttleNo;
/**
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 8b03117..245a447 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -387,6 +387,27 @@
}
});
break;
+ //寮冭溅
+ case 'removeShuttle':
+ wrkNo = data.wrkNo;
+ $.ajax({
+ url: baseUrl+"/wrkMast/removeShuttle/" + wrkNo,
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ method: 'get',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200){
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ break;
}
});
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index aed8900..1be3200 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -121,6 +121,7 @@
<li><a lay-event="cancel">鍙栨秷</a></li>
<li><a lay-event="shuttleCommand">绌挎杞︽寚浠�</a></li>
<li><a lay-event="liftCommand">鎻愬崌鏈烘寚浠�</a></li>
+ <li><a lay-event="removeShuttle">寮冭溅</a></li>
</ul>
</div>
</script>
--
Gitblit v1.9.1