From 76a7d8ed4bacb29ebc2abdc0fff2007b0fe732eb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期六, 18 十月 2025 18:28:31 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 ++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/resources/application.yml | 8 ++++----
4 files changed, 15 insertions(+), 9 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 fd7c8aa..3790740 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -855,7 +855,7 @@
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getForkPos() == 0 && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛屽爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙�");
if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 0) {
- News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏃犵墿");
+ //News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏃犵墿");
//鍫嗗灈鏈烘病鏈夌墿鏂�
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
@@ -881,7 +881,7 @@
}
} else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 1) {
- News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏈夌墿");
+ //News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏈夌墿");
// 鍫嗗灈鏈烘湁鐗╂枡
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
if (wrkMast != null) {
@@ -894,7 +894,7 @@
log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 0) {
- News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏃犵墿");
+ //News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏃犵墿");
// 鍫嗗灈鏈哄伐浣�1鏈夌墿鏂�
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
if (wrkMast != null) {
@@ -923,7 +923,7 @@
log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 1) {
- News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏈夌墿");
+ //News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏈夌墿");
// 鍫嗗灈鏈哄伐浣�2鏈夌墿鏂�
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 2);
if (wrkMast != null) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index b234c6d..b73cb43 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,7 +43,7 @@
}
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index acf564f..79b8568 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -606,6 +606,12 @@
// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈哄伐浣�2plc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
result = siemensNet.Write("DB100.20", array);
+ try {
+ Thread.sleep(100);
+ } catch (Exception e) {
+
+ }
+ result2 = siemensNet.Write("DB100.0", array2);
// }
writeCount1++;
continue;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f8accb7..ae96752 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -133,7 +133,7 @@
ip: 192.168.7.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1004
+ staArr: 1006
crnId: 1
# # LED2
led[1]:
@@ -143,10 +143,10 @@
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1005
crnId: 1
- # LED1
+# # LED1
led[2]:
- id: 121
- ip: 192.168.7.241
+ id: 122
+ ip: 192.168.7.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1006
--
Gitblit v1.9.1