From c1b54ec37a259a1d6fcafd04e2ef10dea4b5a078 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 03 六月 2023 16:04:56 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html                          |   14 +++++++-------
 src/main/java/com/zy/asrs/controller/CrnController.java |   15 +++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 332b43c..d36498b 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -379,6 +379,21 @@
     @ManagerAuth(memo = "浠诲姟瀹屾垚")
     @PostMapping("/operator/taskComplete")
     public R crnTaskComplete(CrnOperatorParam param){
+
+        // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+        CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
+        if (crnThread == null) {
+            return R.error();
+        }
+        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+        if (crnProtocol == null) {
+            return R.error();
+        }
+        //鍫嗗灈鏈虹姸鎬佷笉鏄瓑寰匴CS纭鏃讹紝涓嶈兘涓嬪彂纭浣�
+        if (!crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.WAITING)){
+            return R.error("鍫嗗灈鏈轰笉鏄瓑寰匴CS纭鐘舵��");
+        }
+
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 95b2c06..65e3b31 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -192,19 +192,19 @@
                 <fieldset>
                     <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="steMove()">绉昏溅</button>
-                        <button class="item" onclick="siteMove()">绔欏埌绔�</button>
+<!--                        <button class="item" onclick="put()">鍏ュ簱</button>-->
+<!--                        <button class="item" onclick="take()">鍑哄簱</button>-->
+<!--                        <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>-->
+<!--                        <button class="item" onclick="steMove()">绉昏溅</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="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>

--
Gitblit v1.9.1