From ec37295a8adbb8a6a850e1fddf5957ae5ad662e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 08:52:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index f59a72b..a8fda83 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -27,11 +27,11 @@
             <span>&nbsp;</span>
             <input id="crn1" disabled="disabled">
         </div>
-        <div class="crn-command-item">
-            <label>2#</label>
-            <span>&nbsp;</span>
-            <input id="crn2" disabled="disabled">
-        </div>
+<!--        <div class="crn-command-item">-->
+<!--            <label>2#</label>-->
+<!--            <span>&nbsp;</span>-->
+<!--            <input id="crn2" disabled="disabled">-->
+<!--        </div>-->
     </div>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
     <div class="crn-state">
@@ -90,7 +90,7 @@
             <span class="select-title">鍫嗗灈鏈哄彿</span>
             <div class="select-container">
                 <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
-                <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>
+<!--                <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>-->
             </div>
         </div>
         <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -148,12 +148,14 @@
                 <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="reverseOrigin()">鍙嶅師鐐�</button>
+                <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>
                 <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
-                <button class="item" onclick="pause()">鏆傚仠</button>
-                <button class="item" onclick="boot()">鍚姩</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>
             </div>
         </fieldset>
     </div>
@@ -279,8 +281,8 @@
                     for (var i=1;i<=table.length;i++){
                         var tr = tableEl.find("tr").eq(i);
                         setVal(tr.children("td").eq(0), table[i-1].crnNo);
-                        setVal(tr.children("td").eq(2), table[i-1].workNo);
-                        setVal(tr.children("td").eq(1), table[i-1].status);
+                        setVal(tr.children("td").eq(1), table[i-1].workNo);
+                        setVal(tr.children("td").eq(2), table[i-1].status);
                         setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
                         setVal(tr.children("td").eq(4), table[i-1].staNo);
                         setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
@@ -362,6 +364,13 @@
         });
     }
 
+    // 鍥炲師鐐�
+    function reverseOrigin() {
+        http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
     // 浠诲姟瀹屾垚
     function taskComplete() {
         http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
@@ -390,6 +399,13 @@
         });
     }
 
+    // 鎵嬪姩澶嶄綅
+    function handleReset() {
+        http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
     // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
     function getSiteOutput() {
         $.ajax({

--
Gitblit v1.9.1