From c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:38:58 +0800
Subject: [PATCH] wcs功能完善
---
src/main/webapp/views/rgv.html | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index fc468d9..8d8032c 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -90,18 +90,19 @@
<thead>
<tr>
<th>RGV</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>浠诲姟鍙�1</th>
- <th>鐘舵��1</th>
- <th>鏈夌墿1</th>
+ <th>褰撳墠妯″紡</th>
+ <th>褰撳墠鐘舵��</th>
+ <th>浠诲姟鍙�</th>
+ <th>宸ヤ綔鐘舵��</th>
+ <th>鏈夌墿</th>
<th>RGV浣嶇疆</th>
<th>璧拌瀹氫綅</th>
- <th>浠诲姟鍙�2</th>
- <th>鐘舵��2</th>
- <th>鏈夌墿2</th>
+<!-- <th>浠诲姟鍙�2</th>-->
+<!-- <th>鐘舵��2</th>-->
+<!-- <th>鏈夌墿2</th>-->
<th>鏁呴殰浠ｇ爜</th>
<th>鏁呴殰鎻忚堪</th>
+ <th>閿佸畾鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -151,7 +152,8 @@
<span class="select-title">RGV鍙�</span>
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="rgvSelect" value="1" checked> 1鍙稲GV</label>
- <label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>
+<!-- <label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>-->
+<!-- <label><input type="radio" name="rgvSelect" value="3"> 3鍙稲GV</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -166,10 +168,10 @@
<!-- <span>鎺�</span>-->
<!-- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
<!-- </div>-->
- <div class="select-container-item">
- <span>宸ヤ綅2婧愮珯</span>
- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
+<!-- <div class="select-container-item">-->
+<!-- <span>宸ヤ綅2婧愮珯</span>-->
+<!-- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>-->
+<!-- </div>-->
<!-- <div class="select-container-item">-->
<!-- <span>灞�</span>-->
<!-- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
@@ -188,10 +190,10 @@
<!-- <span>鎺�</span>-->
<!-- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
<!-- </div>-->
- <div class="select-container-item">
- <span>宸ヤ綅2鐩爣绔�</span>
- <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
+<!-- <div class="select-container-item">-->
+<!-- <span>宸ヤ綅2鐩爣绔�</span>-->
+<!-- <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>-->
+<!-- </div>-->
<!-- <div class="select-container-item">-->
<!-- <span>灞�</span>-->
<!-- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
@@ -206,17 +208,18 @@
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
<button class="item" onclick="put()">鍙栨斁璐�</button>
- <button class="item" onclick="take()">鍙栬揣</button>
- <button class="item" onclick="stockMove()">鏀捐揣</button>
+<!-- <button class="item" onclick="take()">鍙栬揣</button>-->
+<!-- <button class="item" onclick="stockMove()">鏀捐揣</button>-->
<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <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="clearCommand()">娓呴櫎鍛戒护</button>-->
+<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
</div>
@@ -315,13 +318,14 @@
setVal(tr.children("td").eq(3), table[i-1].workNo1);
setVal(tr.children("td").eq(4), table[i-1].status1);
setVal(tr.children("td").eq(5), table[i-1].loading1);
- setVal(tr.children("td").eq(6), table[i-1].rgvPos);
+ setVal(tr.children("td").eq(6), table[i-1].rgvPos1);
setVal(tr.children("td").eq(7), table[i-1].walkPos);
- setVal(tr.children("td").eq(8), table[i-1].workNo2);
- setVal(tr.children("td").eq(9), table[i-1].status2);
- setVal(tr.children("td").eq(10), table[i-1].loading2);
- setVal(tr.children("td").eq(11), table[i-1].warnCode);
- setVal(tr.children("td").eq(12), table[i-1].alarm);
+ // setVal(tr.children("td").eq(8), table[i-1].workNo2);
+ // setVal(tr.children("td").eq(9), table[i-1].status2);
+ // 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";
@@ -453,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