From 1b0ad5a82848c113d89dbd3259e0e40604b4b17a Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期一, 25 三月 2024 13:11:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/RgvController.java |    8 ++++----
 src/main/java/com/zy/core/thread/SiemensRgvThread.java  |   14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 493a8d7..64ea3f3 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -159,11 +159,11 @@
             vo.setStatusType(rgvProtocol.modeType.desc);   //  妯″紡鐘舵��
             vo.setStatus(rgvProtocol.getStatusType().desc);     //  鐘舵��
             vo.setWorkNo1(rgvProtocol.getTaskNo1());  //  宸ヤ綅1浠诲姟鍙�
-            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 宸ヤ綅1鐘舵��
-            vo.setLoading1(rgvProtocol.getLoaded1()==1?"鏈夌墿":"鏃犵墿");  // 宸ヤ綅1鏈夌墿
+//            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 宸ヤ綅1鐘舵��
+//            vo.setLoading1(rgvProtocol.getLoaded1()==1?"鏈夌墿":"鏃犵墿");  // 宸ヤ綅1鏈夌墿
             vo.setRgvPos(rgvProtocol.getRgvPos());
-            vo.setRgvPos1(rgvProtocol.getRgvPosI());
-            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"鍦ㄥ畾浣�":"涓嶅湪瀹氫綅");
+//            vo.setRgvPos1(rgvProtocol.getRgvPosI());
+//            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"鍦ㄥ畾浣�":"涓嶅湪瀹氫綅");
             vo.setPakMk(rgvThread.isPakMk()?"鏃犻攣":"閿佸畾");
 //            vo.setWorkNo2(rgvProtocol.getTaskNo2());  //  宸ヤ綅2浠诲姟鍙�
 //            vo.setStatus2(rgvProtocol.getStatusType2().desc);  // 宸ヤ綅2鐘舵��
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index 9a49df5..4bef755 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -172,7 +172,7 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 30);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 16);
             if (result.IsSuccess) {
                 if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
                     rgvProtocol = new RgvProtocol();
@@ -185,7 +185,7 @@
                 rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                 rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                 rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
+                rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
 
 
                 OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
@@ -253,18 +253,18 @@
         boolean[] array = new boolean[1];
         array[0] = true;
         if (command.isAuto()){
-            result = siemensNet.Write("DB99.0.1", array);
+            result = siemensNet.Write("DB99.0.0", true);
         } else if (command.isRestoreTask()) {
-            result = siemensNet.Write("DB99.0.2", array);
+            result = siemensNet.Write("DB99.0.1", true);
         }
         else if (command.isCompTask()) {
-            result = siemensNet.Write("DB99.0.3", array);
+            result = siemensNet.Write("DB99.0.2", true);
         }
         else if (command.isStop()) {
-            result = siemensNet.Write("DB99.0.4", array);
+            result = siemensNet.Write("DB99.0.3", true);
         }
         else if (command.isReset()) {
-            result = siemensNet.Write("DB99.0.5", array);
+            result = siemensNet.Write("DB99.0.4", true);
         }
 
 //        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {

--
Gitblit v1.9.1