From 7d116115ade208f26ada36806642d2a3a6085c91 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 三月 2026 13:07:49 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
index 4c3e724..6c402da 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.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.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.operation.OperationHandler;
@@ -28,7 +27,6 @@
@Autowired
private SlaveProperties slaveProperties;
-
@Autowired
@@ -56,11 +54,17 @@
if (!staProtocol.isLoading()) {
return;
}
+ StaProtocol staProtocol5 = devpThread.getStation().get(1005);
+ if (staProtocol5.isLoading()){
+ log.info("1005鏈夌墿锛岀瓑鏃犵墿涔嬪悗鎵嶅叆搴�");
+ return;
+ }
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job jobByWorkNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (jobByWorkNo != null && jobByWorkNo.getJobSts() == 1) {
- staProtocol.setStaNo(1006);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
+ staProtocol.setWorkNo(9992);
+ staProtocol.setStaNo(1005);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(TaskType.WRITE, staProtocol));
if (result) {
jobByWorkNo.setJobSts(3);
jobByWorkNo.setMemo("妯℃嫙鎸夋寜閽�");
--
Gitblit v1.9.1