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/operation/handler/InOperationHandler.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 0171836..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,17 +69,23 @@
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);
job.setInTime(new Date());
- if (jobService.updateById(job)) {
+ if (!jobService.updateById(job)) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
log.info("" + config.getMark() + "鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
@@ -87,7 +93,7 @@
} else {
// 妯℃嫙鎿嶄綔閫昏緫
}
- }
+ //}
}
}
}
--
Gitblit v1.9.1