From 0d51d316d7326558fadaf98a1d5a838bc7109bab Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 16:26:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 142 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 119 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 6eb1082..8a1ebca 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -87,8 +87,8 @@
<div id="crn-select" class="operator-item">
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
- <label><input type="radio" name="crn" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crn" value="2"> 2鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -97,19 +97,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceLev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -119,19 +119,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="lev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -142,16 +142,16 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item">鍏ュ簱</button>
- <button class="item">鍑哄簱</button>
- <button class="item">搴撲綅杞Щ</button>
- <button class="item">绔欏埌绔�</button>
- <button class="item">鍧愭爣绉诲姩</button>
- <button class="item">鍥炲師鐐�</button>
- <button class="item">浠诲姟瀹屾垚</button>
- <button class="item">鏆傚仠</button>
- <button class="item">鍚姩</button>
- <button class="item">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="put()">鍏ュ簱</button>
+ <button class="item" onclick="take()">鍑哄簱</button>
+ <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
+ <button class="item" onclick="siteMove()">绔欏埌绔�</button>
+ <button class="item" onclick="coorMove()">鍧愭爣绉诲姩</button>
+ <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>
+ <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="pause()">鏆傚仠</button>
+ <button class="item" onclick="boot()">鍚姩</button>
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
</div>
</fieldset>
</div>
@@ -172,6 +172,7 @@
// 鍒濆鍖�
var crnOutputDom = document.getElementById("crn-output");
$(document).ready(function() {
+ getCommandLog();
initCrnStateTable();
getCrnStateInfo();
initCrnMsgTable();
@@ -258,9 +259,9 @@
success: function (res) {
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
+ if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
initCrnStateTable(table.length-crnStateTableBlankRows);
- crnStateTableFullRows = table.length;
+ crnMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
@@ -284,7 +285,102 @@
});
}
- // 杈撻�佽澶囨棩蹇楄緭鍑�
+ // 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
+
+ function getReqParam() {
+ var crnNo = $('input[name="crnSelect"]:checked').val();
+ var sourceStaNo = $('#sourceStaNo').val();
+ var sourceRow = $('#sourceRow').val();
+ var sourceBay = $('#sourceBay').val();
+ var sourceLev = $('#sourceLev').val();
+ var staNo = $('#staNo').val();
+ var row = $('#row').val();
+ var bay = $('#bay').val();
+ var lev = $('#lev').val();
+ return {
+ crnNo: crnNo,
+ sourceStaNo: sourceStaNo,
+ sourceRow: sourceRow,
+ sourceBay: sourceBay,
+ sourceLev: sourceLev,
+ staNo: staNo,
+ row: row,
+ bay: bay,
+ lev: lev
+ };
+ }
+
+ // 鍏ュ簱
+ function put() {
+ http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍑哄簱
+ function take() {
+ http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 搴撲綅杞Щ
+ function stockMove() {
+ http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 绔欏埌绔�
+ function siteMove() {
+ http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍧愭爣绉诲姩
+ function coorMove() {
+ http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍥炲師鐐�
+ function bacOrigin() {
+ http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 浠诲姟瀹屾垚
+ function taskComplete() {
+ http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鏆傚仠
+ function pause() {
+ http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 鍚姩
+ function boot() {
+ http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 娓呴櫎鍛戒护
+ function clearCommand() {
+ http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ alert(res.msg);
+ });
+ }
+
+ // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
function getSiteOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
--
Gitblit v1.9.1