From 966626cb396cdd881e4f7684078bbf6dbdabe34f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 九月 2025 11:14:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/resources/license.lic | 0
2 files changed, 3 insertions(+), 3 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 7f2d211..1c79b11 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -364,7 +364,7 @@
// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
Integer commandStep = taskWrk.getCommandStep();
- CommandInfo commandInfo = commandInfos.get(commandStep);
+ CommandInfo commandInfo = commandInfos.get(1);
CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
//StaProtocol staProtocol1 = JSON.parseObject(commandInfo.getCommand(), StaProtocol.class);
StaProtocol staProtocol1 = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
@@ -511,7 +511,7 @@
if (commandInfos.isEmpty()) {
continue;//鍛戒护绌�
}
- CommandInfo commandInfo = commandInfos.get(commandStep);
+ CommandInfo commandInfo = commandInfos.get(0);
CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
@@ -681,7 +681,7 @@
continue;//鎸囦护宸叉墽琛�
}
- CommandInfo commandInfo = commandInfos.get(commandStep);
+ CommandInfo commandInfo = commandInfos.get(0);
CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 127cc29..00311bf 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1