From 973c39835a23d4908ce6056fafc2a8db35d76826 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 14 三月 2025 15:20:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ForkLiftController.java | 9 +--------
src/main/webapp/views/forklift.html | 10 ----------
2 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ForkLiftController.java b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
index e37f1aa..844e50a 100644
--- a/src/main/java/com/zy/asrs/controller/ForkLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
@@ -12,10 +12,8 @@
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.service.BasLiftService;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.ForkLiftUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.action.ForkLiftAction;
-import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ForkLiftProtocolStatusType;
@@ -23,12 +21,9 @@
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ForkLiftSlave;
-import com.zy.core.model.LiftSlave;
-import com.zy.core.model.Task;
import com.zy.core.model.command.*;
import com.zy.core.model.protocol.ForkLiftProtocol;
import com.zy.core.model.protocol.ForkLiftStaProtocol;
-import com.zy.core.model.protocol.LiftStaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ForkLiftThread;
import lombok.extern.slf4j.Slf4j;
@@ -164,9 +159,7 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R liftUpdate(@RequestParam Integer liftNo,
- @RequestParam Short workNo,
- @RequestParam String pakMk,
- @RequestParam Integer token) {
+ @RequestParam Short workNo) {
ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
if (forkLiftThread == null) {
return R.error("plc宸叉帀绾�");
diff --git a/src/main/webapp/views/forklift.html b/src/main/webapp/views/forklift.html
index d9de518..2f5c1a0 100644
--- a/src/main/webapp/views/forklift.html
+++ b/src/main/webapp/views/forklift.html
@@ -51,7 +51,6 @@
<th>鎻愬崌鏈�</th>
<th>宸ヤ綔鍙�</th>
<th>绔欑偣淇℃伅</th>
- <th>浣滀笟鏍囪</th>
</tr>
</thead>
<tbody>
@@ -118,12 +117,6 @@
<input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
</div>
</div>
- <div class="form-item">
- <label class="form-label">浣滀笟鏍囪:</label>
- <div class="form-input">
- <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
- </div>
- </div>
<div class="form-item form-button-container">
<button class="form-button" id="save">淇濆瓨</button>
<button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
@@ -178,8 +171,6 @@
http.post(baseUrl+ "/forkLift/detl/update", {
liftNo: $('#liftNo').val(),
workNo: $('#workNo').val(),
- pakMk: $('#pakMk').val(),
- token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -282,7 +273,6 @@
setVal(tr.children("td").eq(0), table[i-1].liftNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
setVal(tr.children("td").eq(2), staDiv);
- setVal(tr.children("td").eq(3), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1