From 820a2b268b0a95041bb3d4b1a393adc42c88d077 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 02 三月 2023 10:53:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 1 +
src/main/java/com/zy/core/enums/SteTaskModeType.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index e1ba845..b1b9d39 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -59,10 +59,10 @@
public static SteTaskModeType findInByLoc(String locNo) {
switch (Utils.getGroupRow(locNo, true)) {
- case 17:
- return SteTaskModeType.IN_RIGHT; // 鍙�
- case 18:
- return SteTaskModeType.IN_LEFT; // 宸�
+ case 4:
+ return SteTaskModeType.IN_LEFT; // 宸�
+ case 5:
+ return SteTaskModeType.IN_RIGHT; // 鍙�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
@@ -70,10 +70,10 @@
public static SteTaskModeType findOutByLoc(String locNo) {
switch (Utils.getGroupRow(locNo, false)) {
- case 2:
- return SteTaskModeType.OUT_RIGHT; // 鍙�
- case 30:
- return SteTaskModeType.OUT_LEFT; // 宸�
+ case 4:
+ return SteTaskModeType.OUT_LEFT; // 鍙�
+ case 5:
+ return SteTaskModeType.OUT_RIGHT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
@@ -107,9 +107,9 @@
public static SteTaskModeType findWaiting(Integer row) {
if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
- return SteTaskModeType.BACK_ORIGIN;
+ return SteTaskModeType.WAITING_RIGHT;
} else if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
- return SteTaskModeType.GO_ORIGIN;
+ return SteTaskModeType.WAITING_LEFT;
} else {
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 81ab807..75e9700 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -226,6 +226,7 @@
News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+ siemensNet.Write("DB100.18", (short) 0);
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
--
Gitblit v1.9.1