From b82892d4b6d7ddd51d550871223036e993f76cf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 14:32:50 +0800
Subject: [PATCH] 提升机、穿梭车独占令牌页面显示与控制
---
src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java | 6 ++++++
src/main/java/com/zy/asrs/controller/ShuttleController.java | 8 ++++++--
src/main/webapp/views/shuttle.html | 12 ++++++++++++
src/main/java/com/zy/asrs/controller/LiftController.java | 9 +++++++--
src/main/webapp/views/lift.html | 14 +++++++++++++-
5 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 0b5503b..5af0336 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -110,6 +110,7 @@
vo.setDistAddress(liftProtocol.getDistAddress());
vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
+ vo.setToken(liftProtocol.getToken());//浠ょ墝
}
return R.ok().add(list);
}
@@ -208,8 +209,9 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R liftUpdate(@RequestParam Integer liftNo,
- @RequestParam Short workNo,
- @RequestParam String pakMk){
+ @RequestParam Short workNo,
+ @RequestParam String pakMk,
+ @RequestParam Integer token) {
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
if (liftThread == null) {
return R.error("plc宸叉帀绾�");
@@ -224,6 +226,9 @@
if (pakMk != null) {
liftProtocol.setPakMk(pakMk.equals("Y"));
}
+ if (token != null) {
+ liftProtocol.setToken(token);
+ }
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 896319a..99bf851 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -328,8 +328,9 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R shuttleUpdate(@RequestParam Integer shuttleNo,
- @RequestParam Integer workNo,
- @RequestParam String pakMk){
+ @RequestParam Integer workNo,
+ @RequestParam String pakMk,
+ @RequestParam Integer token) {
NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
if (shuttleThread == null) {
return R.error("plc宸叉帀绾�");
@@ -344,6 +345,9 @@
if (pakMk != null) {
shuttleProtocol.setPakMk(pakMk.equals("Y"));
}
+ if (token != null) {
+ shuttleProtocol.setToken(token);
+ }
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
index 8b89b7b..5c23ee9 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
@@ -39,4 +39,10 @@
*/
private Integer shuttleNo;
+ /**
+ * 浠ょ墝
+ */
+ private Integer token;
+
+
}
diff --git a/src/main/webapp/views/lift.html b/src/main/webapp/views/lift.html
index 581a76d..0de4eab 100644
--- a/src/main/webapp/views/lift.html
+++ b/src/main/webapp/views/lift.html
@@ -60,6 +60,7 @@
<th>灞�</th>
<th>浣滀笟鏍囪</th>
<th>绌挎杞﹀彿</th>
+ <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -129,6 +130,12 @@
<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
</div>
</div>
+ <div class="form-item">
+ <label class="form-label">浠ょ墝:</label>
+ <div class="form-input">
+ <input id="token" name="token" 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>
@@ -193,9 +200,10 @@
liftNo: $('#liftNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
+ token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
- layer.close(layerIdx);
+ layer.close(layerDetl);
})
})
@@ -297,6 +305,7 @@
setVal(tr.children("td").eq(5), table[i-1].lev);
setVal(tr.children("td").eq(6), table[i-1].pakMk);
setVal(tr.children("td").eq(7), table[i-1].shuttleNo);
+ setVal(tr.children("td").eq(8), table[i-1].token);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -447,6 +456,7 @@
$('#liftNo').val(liftNo);
$('#workNo').val(table[i-1].workNo);
$('#pakMk').val(table[i-1].pakMk);
+ $('#token').val(table[i-1].token);
}
}
} else if (res.code === 403){
@@ -461,6 +471,7 @@
$('#liftNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
}
})
}
@@ -470,6 +481,7 @@
$('#liftNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
layer.close(layerDetl);
})
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 0651ec9..f786948 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -71,6 +71,7 @@
<th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
<th>褰撳墠搴撲綅</th>
+ <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -169,6 +170,12 @@
<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
</div>
</div>
+ <div class="form-item">
+ <label class="form-label">浠ょ墝:</label>
+ <div class="form-input">
+ <input id="token" name="token" 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>
@@ -231,6 +238,7 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
+ token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -342,6 +350,7 @@
setVal(tr.children("td").eq(10), table[i-1].statusSum.mileage);
setVal(tr.children("td").eq(11), table[i-1].pakMk$);
setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
+ setVal(tr.children("td").eq(13), table[i-1].token);
if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
$("#runSpeedText").text(table[i-1].runSpeed)
$("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -520,6 +529,7 @@
$('#shuttleNo').val(shuttleNo);
$('#workNo').val(table[i-1].taskNo);
$('#pakMk').val(table[i-1].pakMk$);
+ $('#token').val(table[i-1].token);
}
}
} else if (res.code === 403){
@@ -534,6 +544,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
}
})
}
@@ -543,6 +554,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1