From db093d853136fa7809eb1c5e512656bfb8980d15 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 05 四月 2024 19:13:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/RgvThread.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index d53239b..b3d3f21 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -107,7 +107,7 @@
                             commandAvoidanceXY = new RgvCommand();
                         }
                         commandAvoidanceXY.setRgvNo(slave.getId()); // RGV缂栧彿
-                        commandAvoidanceXY.setTaskNo1((short) 29999); // 宸ヤ綔鍙�
+                        commandAvoidanceXY.setTaskNo1((short) 32222); // 宸ヤ綔鍙�
                         commandAvoidanceXY.setAckFinish1((short) 1);  // 浠诲姟瀹屾垚纭浣�
                         commandAvoidanceXY.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
                         commandAvoidanceXY.setSourceStaNo1((short)0);     // 婧愮珯
@@ -238,6 +238,7 @@
                     BasRgv basRgv = new BasRgv();
                     basRgv.setRgvNo(slave.getId());
                     basRgv.setRgvSts((int)rgvProtocol.getMode());
+                    basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
                     if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
                         log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                     }

--
Gitblit v1.9.1