From 5d0f7a5aa4ee994782f3f3bcc66e23653a6ac40a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 七月 2024 10:07:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensRgvThread.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index eef97a6..c4ff6b6 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -497,17 +497,17 @@
         String status = "";
         command.setRgvNo(slave.getId());
         short[] array = new short[2];
-        array[0] = command.getSourceStaNo2();
-        array[1] = command.getDestinationStaNo2();
+        array[0] = command.getDestinationStaNo1();
+        array[1] = command.getSourceStaNo1();
 
         OperateResult result = siemensNet.Write("DB19.0", array);
-        if (command.getTaskMode1().equals(RgvTaskModeType.FETCH)){
+        if (command.getTaskMode1().equals(RgvTaskModeType.FETCH.id.shortValue())){
             status = "4.1";
-        } else if (command.getTaskMode1().equals(RgvTaskModeType.PUT)){
+        } else if (command.getTaskMode1().equals(RgvTaskModeType.PUT.id.shortValue())){
             status = "4.2";
-        } else if (command.getTaskMode1().equals(RgvTaskModeType.X_MOVE)){
+        } else if (command.getTaskMode1().equals(RgvTaskModeType.X_MOVE.id.shortValue())){
             status = "4.0";
-        } else if (command.getTaskMode1().equals(RgvTaskModeType.FETCH_PUT)){
+        } else if (command.getTaskMode1().equals(RgvTaskModeType.FETCH_PUT.id.shortValue())){
             status = "4.3";
         } else {
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [DB鍧楋細{4}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), "DB19."+status));

--
Gitblit v1.9.1