From 31ed3a4719ba497e2d6b68f1283f9574aec2ade8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 14:43:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/SteController.java |    4 ++++
 src/main/webapp/views/ste.html                          |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 7ff7b92..209e18d 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -229,6 +229,10 @@
                 steCommand.setSteNo(ste.getId()); // 绌挎杞︾紪鍙�
                 if (param.getSteTaskMode() == 16) {
                     steCommand.setComplete(true);
+                } else if (param.getSteTaskMode() == 17) {
+                    steCommand.setControlMode((short) 1);
+                } else if (param.getSteTaskMode() == 18) {
+                    steCommand.setControlMode((short) 0);
                 } else {
                     if (steTaskModeType == null) {
                         throw new CoolException("浠诲姟绫诲瀷閿欒");
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 0fdaeb6..6cb2810 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -105,6 +105,8 @@
                     <fieldset>
                         <legend>鎵嬪姩鎿嶄綔</legend>
                         <div class="button-group">
+                            <button class="item" onclick="steOperator(17)">鑱旀満</button>
+                            <button class="item" onclick="steOperator(18)">鑴辨満</button>
                             <button class="item" onclick="steOperator(1)">宸﹀嚭搴�</button>
                             <button class="item" onclick="steOperator(2)">鍙冲嚭搴�</button>
                             <button class="item" onclick="steOperator(3)">宸﹀叆搴�</button>
@@ -121,6 +123,7 @@
 <!--                            <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
 <!--                            <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
                             <button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>
+
                         </div>
                     </fieldset>
                 </div>

--
Gitblit v1.9.1