From 5bf9fc880a56385f0b49e8cd3a05eced20d616d1 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 10:20:38 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html                              |   14 +++++++-------
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    9 +++++++--
 src/main/webapp/static/js/console.map.js                    |    1 +
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index cd48e57..5fee426 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1203,10 +1203,15 @@
                         crnCommand.setTaskNo((short)999); // 宸ヤ綔鍙�
                         crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
                         crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡:  绔欎綅绉昏浆4
-                        crnCommand.setSourcePosX((short) 1);     // 婧愬簱浣嶆帓
+                        Integer crnNo = crnProtocol.getCrnNo();
+                        int row1 = crnNo * 4;
+                        if (crnNo>2){
+                            row1 = row1-2;
+                        }
+                        crnCommand.setSourcePosX((short) row1);     // 婧愬簱浣嶆帓
                         crnCommand.setSourcePosY((short) 1);     // 婧愬簱浣嶅垪
                         crnCommand.setSourcePosZ((short) 1);   // 婧愬簱浣嶅眰
-                        crnCommand.setDestinationPosX((short) 1);     // 鐩爣搴撲綅鎺�
+                        crnCommand.setDestinationPosX((short) row1);     // 鐩爣搴撲綅鎺�
                         crnCommand.setDestinationPosY((short) 1);     // 鐩爣搴撲綅灞�
                         crnCommand.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅鍒�
                         if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 8fbca8c..94f401e 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -289,6 +289,7 @@
             "width": 2900,
             "height": 600,
             "stns": [
+                { "type": "stn", "id": "site-125", "text": "125", "top": 416, "left": 1162, "width": 54, "height": 20 },
             ],
             "barcode": []
         },
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index d535245..7ae3b0e 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -77,12 +77,12 @@
                     <!--            <span>&nbsp;</span>-->
                     <input id="crn4" disabled="disabled">
                 </div>
-                <div class="crn-command-item">
-                    <label>5#</label>
-                    <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
-                    <!--            <span>&nbsp;</span>-->
-                    <input id="crn5" disabled="disabled">
-                </div>
+<!--                <div class="crn-command-item">-->
+<!--                    <label>5#</label>-->
+<!--                    <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--                    <input id="crn5" disabled="disabled">-->
+<!--                </div>-->
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -152,7 +152,7 @@
                         <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>
-                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5鍙峰爢鍨涙満</label>
+<!--                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5鍙峰爢鍨涙満</label>-->
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->

--
Gitblit v1.9.1