From 286eadc0913fe9974ab2f2fd188fb707dc16ad40 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 二月 2026 09:16:14 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 ce272ca..e48aa59 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
@@ -10,6 +10,7 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ConveyorStateType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.TaskType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
@@ -22,6 +23,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
/**
* 鍏ュ簱
@@ -60,37 +63,35 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
if (staProtocol == null) {
- return;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (!staProtocol.isLoading()) {
- return;
+ continue;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, devp.getId());
String barcode = barcodeThread.getBarcode();
- if (Cools.isEmpty(barcode)){
- return;
+ if (Cools.isEmpty(barcode)) {
+ continue;
}
Job job = jobService.getJobByBarcode(barcode);
if (job != null) {
Integer targetSta = inSta.getTargetSta();
staProtocol.setWorkNo(job.getJobNo());
staProtocol.setStaNo(targetSta);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol));
if (result) {
- job.setJobSts(5);
+ job.setJobSts(ConveyorStateType.INBOUND.getStatus());
+ job.setStartTime(new Date());
if (!jobService.updateById(job)) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
- log.info("" + config.getMark() + "鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
+ log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
- } else {
- // 妯℃嫙鎿嶄綔閫昏緫
}
- //}
}
}
}
--
Gitblit v1.9.1