From 5e61001f8678d26ffdf230e640b32c3632220d58 Mon Sep 17 00:00:00 2001
From: ZY <zc>
Date: 星期二, 05 八月 2025 10:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

---
 src/main/webapp/views/crn.html |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7a75854..8c87a2e 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -71,6 +71,12 @@
                     <!--            <span>&nbsp;</span>-->
                     <input id="crn3" disabled="disabled">
                 </div>
+<!--                <div class="crn-command-item">-->
+<!--                    <label>4#</label>-->
+<!--                    <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--                    <input id="crn4" disabled="disabled">-->
+<!--                </div>-->
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -139,6 +145,7 @@
                         <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="3">&nbsp;3鍙峰爢鍨涙満</label>
+<!--                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4鍙峰爢鍨涙満</label>-->
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -194,7 +201,7 @@
                     <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="stockMove()">搴撲綅杞Щ</button>
 <!--                        <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
                         <!--                <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
                         <!--                <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->

--
Gitblit v1.9.1