From b8acabe1015de18b190b70a051c6546a91200b6b Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 01 三月 2023 17:00:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 8 ++++++--
src/main/java/com/zy/core/enums/SteTaskModeType.java | 4 ++--
src/main/resources/application.yml | 20 ++++++++++----------
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 888965d..e1ba845 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -107,9 +107,9 @@
public static SteTaskModeType findWaiting(Integer row) {
if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
- return SteTaskModeType.WAITING_LEFT;
+ return SteTaskModeType.BACK_ORIGIN;
} else if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
- return SteTaskModeType.WAITING_RIGHT;
+ return SteTaskModeType.GO_ORIGIN;
} 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 d9383fd..81ab807 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -234,8 +234,10 @@
array[2] = command.getTaskMode();
if (command.getSourcePosX()==4){
array[3] = 1;
- }else {
+ }else if (command.getSourcePosX()==5){
array[3] = 2;
+ }else {
+ array[3] = command.getSourcePosX();
}
@@ -243,8 +245,10 @@
array[5] = command.getSourcePosZ();
if (command.getDestinationPosX()==4){
array[6] = 1;
- }else {
+ }else if (command.getDestinationPosX()==5){
array[6] = 2;
+ }else {
+ array[6] = command.getDestinationPosX();
}
array[7] = command.getDestinationPosY();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d3cbd80..d8701c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -69,43 +69,43 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 4
- bay: 1
+ bay: 6
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 202
row: 4
- bay: 1
- lev: 2
+ bay: 6
+ lev: 3
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 302
row: 4
- bay: 1
- lev: 3
+ bay: 6
+ lev: 6
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 4
- bay: 1
+ bay: 6
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 202
row: 4
- bay: 1
- lev: 2
+ bay: 6
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 302
row: 4
- bay: 1
- lev: 3
+ bay: 6
+ lev: 6
# 绌挎杞�1
ste[0]:
id: 1
--
Gitblit v1.9.1