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/ClearSingleOperationHandler.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearSingleOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearSingleOperationHandler.java
index 29b6f55..20952ec 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearSingleOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearSingleOperationHandler.java
@@ -1,13 +1,12 @@
package com.zy.core.operation.handler;
import com.zy.asrs.entity.Job;
-import com.zy.asrs.service.CtuMainService;
import com.zy.asrs.service.JobService;
-import com.zy.asrs.service.WrkLastnoService;
import com.zy.core.cache.MessageQueue;
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;
@@ -33,12 +32,6 @@
@Autowired
- private WrkLastnoService wrkLastnoService;
-
- @Autowired
- private CtuMainService ctuMainService;
-
- @Autowired
private JobService jobService;
@@ -58,24 +51,24 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(takeSta.getStaNo());
if (staProtocol == null) {
- return;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (staProtocol.isLoading()) {
- return;
+ continue;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (job != null && job.getJobSts() == 7) {
+ if (job != null && job.getJobSts() == ConveyorStateType.SENDTASK.getStatus()) {
//String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
staProtocol.setWorkNo(0);
staProtocol.setStaNo(0);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(TaskType.WRITE, staProtocol));
if (result) {
log.info("" + config.getMark() + "绔欑偣娓呯┖澶辫触锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
- job.setJobSts(8);
+ job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
jobService.updateById(job);
}
}
--
Gitblit v1.9.1