From e628feceb32d3a42b85d2f25864700af82527d3d Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 25 七月 2024 17:07:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 +++++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +++----
src/main/resources/application.yml | 12 ++++++------
3 files changed, 14 insertions(+), 12 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 071bfaa..46e5cee 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1696,10 +1696,9 @@
crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setDestinationStaNo(crnStn.getPlatNo().shortValue());
+// crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
+// crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
+// crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setDestinationStaNo(crnStn.getPlatNo().shortValue());
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index cc4f6c1..c89817a 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -257,10 +257,13 @@
array[11] = command.getCommand();
OperateResult result = siemensNet.Write("DB100.0", array);
- if (command.getAckFinish() == 0) {
+ if(!result.IsSuccess){
+ return false;
+ }
+ if (command.getAckFinish().intValue() == 0) {
short commandFinish = 1;
Thread.sleep(100L);
- result = siemensNet.Write("DB100.18", commandFinish);
+ result = siemensNet.Write("DB100.22", commandFinish);
}
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d3e1ab9..0a20fd8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -250,7 +250,7 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
# devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2077
+ staNo: 3011
platNo: 1
row: 23
bay: 1
@@ -258,15 +258,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
# devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 3011
- platNo: 3
+ staNo: 2076
+ platNo: 4
row: 23
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
# devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2076
+ staNo: 3012
platNo: 2
row: 22
bay: 1
@@ -274,8 +274,8 @@
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
# devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 3012
- platNo: 4
+ staNo: 2077
+ platNo: 3
row: 22
bay: 1
lev: 2
--
Gitblit v1.9.1