From 38ce5bc7cd58a218f89d8f9ca6aacd7e14d6d93e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 二月 2026 15:53:54 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 2beb955..1512cee 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
@@ -50,7 +50,7 @@
}
@Override
- public void execute(CtuOperationConfig config) {
+ public synchronized void execute(CtuOperationConfig config) {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -71,20 +71,19 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
//StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
//if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
- Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
+ Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 4);
if (job != null) {
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(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());
+ job.setJobSts(5);
if (!jobService.updateById(job)) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
--
Gitblit v1.9.1