From 07f7728072de5998300cd9ec6a93fcc2c26b06cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 27 一月 2026 09:22:03 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
index 6a61b58..2beb955 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
@@ -69,12 +69,18 @@
return;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
- if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
+ //StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
+ //if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
if (job != null) {
- staProtocol.setWorkNo(staProtocol.getWorkNo());
- staProtocol.setStaNo(inSta.getTargetSta());
+ Integer workNo = staProtocol.getWorkNo();
+ Integer targetSta = inSta.getTargetSta();
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo(0);
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ Thread.sleep(1500L);
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(targetSta);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
if (result) {
job.setJobSts(4);
@@ -87,7 +93,7 @@
} else {
// 妯℃嫙鎿嶄綔閫昏緫
}
- }
+ //}
}
}
}
--
Gitblit v1.9.1