From fc976b0bc327a19db87e4b2c140ea5552988312a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 16:54:26 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 7 +++----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 5 +----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index b3dcb83..8049f9f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -25,7 +25,7 @@
@Slf4j
@Component
-public class OutOperationHandler implements OperationHandler {
+public class OutOperationHandler implements OperationHandler {
@Autowired
private SlaveProperties slaveProperties;
@@ -82,8 +82,7 @@
}
String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
if (seqNum != null) {
- Job jobBySeqNum = jobService.getJobByTaskNo(seqNum);
- if (jobBySeqNum == null) {
+ if (jobService.getJobByTaskNo(seqNum) == null) {
int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
// 涓嬪彂绉诲姩 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(workNo);
@@ -93,7 +92,7 @@
job.setJobNo(workNo);
job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
if (!jobService.insert(job)) {
- throw new CoolException("鎻掑叆杈撻�佺嚎浠诲姟澶辫触," + jobBySeqNum + " - " + workNo);
+ throw new CoolException("鎻掑叆杈撻�佺嚎浠诲姟澶辫触," + seqNum + " - " + workNo);
}
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
log.info("杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index dbc7d9a..c425337 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -33,8 +33,6 @@
private Map<Integer, StaProtocol> station;
- private volatile boolean connected = false;
-
private static final int WRITE_RETRY_MAX = 5;
private static final int WRITE_RETRY_INTERVAL_MS = 200;
@@ -75,7 +73,7 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- if (!connected || siemensS7Net == null) {
+ if (siemensS7Net == null) {
log.warn("PLC鏈繛鎺ワ紝璺宠繃璇诲彇 [id:{}]", slave.getId());
return;
}
@@ -90,7 +88,6 @@
if (!result.IsSuccess) {
log.error("璇诲彇绔欑偣鐘舵�佸け璐� [id:{}] [error:{}]", slave.getId(), result.Message);
- connected = false;
return;
}
--
Gitblit v1.9.1