From f681705ebffb690d25e0e2bea922617a01ea30af Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 27 一月 2026 13:06:44 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java | 2 +-
zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java | 3 ++-
zy-acs-cv/src/main/resources/application.yml | 4 ++++
zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java | 1 +
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java b/zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java
index c84e463..93953c4 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java
@@ -3,8 +3,9 @@
public enum ConveyorStateType {
OUTBOUND,
- FAKEWMS,
+ FAKEUSER,
INBOUND,
+ FAKEWMS,
FAKETASK,
CLEARSIGNAL,
SENDTASK;
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java
index 9a26c26..f69034b 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java
@@ -69,6 +69,7 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
if (job != null && job.getJobSts() >= 5) {
+ String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
staProtocol.setWorkNo(0);
staProtocol.setStaNo(0);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
index db07397..c4227f8 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
@@ -42,7 +42,7 @@
@Override
public ConveyorStateType getType() {
- return ConveyorStateType.FAKEWMS;
+ return ConveyorStateType.FAKEUSER;
}
@Override
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c165896..fe593e3 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -108,7 +108,7 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol) task.getData());
- log.info("杈撻�佺嚎涓嬪彂鍛戒护锛�" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
+ //log.info("杈撻�佺嚎涓嬪彂鍛戒护锛�" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 3:
@@ -319,7 +319,7 @@
Thread.sleep(200);
write1 = siemensS7Net.Write("DB100." + (index * 4 + 2), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
if (write.IsSuccess && write1.IsSuccess) {
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
} else {
writeCount++;
diff --git a/zy-acs-cv/src/main/resources/application.yml b/zy-acs-cv/src/main/resources/application.yml
index 5890890..7f49dc6 100644
--- a/zy-acs-cv/src/main/resources/application.yml
+++ b/zy-acs-cv/src/main/resources/application.yml
@@ -29,6 +29,10 @@
mark: 10
max-retries: 3
retry-delay: 500
+ - type: FAKEUSER
+ mark: 30
+ max-retries: 2
+ retry-delay: 300
- type: FAKEWMS
mark: 30
max-retries: 2
--
Gitblit v1.9.1