From a4ec8a6945091ad596e59092b66df441496092c0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 01 三月 2024 15:29:45 +0800
Subject: [PATCH] #车锁
---
src/main/java/com/zy/asrs/controller/RgvController.java | 1 +
src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java | 2 ++
src/main/webapp/views/rgv.html | 11 ++++++++++-
src/main/java/com/zy/asrs/controller/CrnController.java | 9 +++++++++
4 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 05e21e0..e076aaf 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -35,6 +35,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -384,6 +385,14 @@
return crnControl(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "瑙ｉ攣灏忚溅")
+ @PostMapping("/lock")
+ public R lock(CrnOperatorParam param){
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
+ rgvThread.setPakMk(true);
+ return R.ok();
+ }
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index e545485..ed1a265 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -86,6 +86,7 @@
vo.setRgvPos(rgvProtocol.getRgvPos());
vo.setRgvPos1(rgvProtocol.getRgvPosI());
vo.setWalkPos(rgvProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setPakMk(rgvThread.isPakMk()?"Y":"N");
// vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
// vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
// vo.setLoading2(rgvProtocol.getLoaded2()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅2鏈夌墿
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
index 0e892c0..a205d5d 100644
--- a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
@@ -48,4 +48,6 @@
private String alarm = "-";
private Integer RgvPos1 = 0;
+ private String pakMk="-";
+
}
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index 8030c78..4d8d9d8 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -102,6 +102,7 @@
<!-- <th>鏈夌墿2</th>-->
<th>鏁呴殰浠ｇ爜</th>
<th>鏁呴殰鎻忚堪</th>
+ <th>閿佸畾鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -214,10 +215,11 @@
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="lock()">瑙ｉ攣</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
</div>
@@ -323,6 +325,7 @@
// setVal(tr.children("td").eq(10), table[i-1].loading2);
setVal(tr.children("td").eq(8), table[i-1].warnCode);
setVal(tr.children("td").eq(9), table[i-1].alarm);
+ setVal(tr.children("td").eq(10), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -454,6 +457,12 @@
});
}
+ function lock() {
+ http.post(baseUrl+"/rgv/lock", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
// 鏆傚仠
function pause() {
http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {
--
Gitblit v1.9.1