From 14f2c4fce50c871d84f89d2dca2298e0892b4672 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 08:25:26 +0800
Subject: [PATCH] Merge branch 'rcs_master_1.0' into rcs_master_all
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
index 760106d..81d9c40 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
@@ -73,8 +73,8 @@
continue;
}
if (staProtocol.isAutoing()) {
- Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (job != null && job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
+ Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.INBOUND.getStatus());
+ if (job != null ) {
if (ctuMainService.sendTask(process(job))) {
job.setJobSts(ConveyorStateType.SENDTASK.getStatus());
job.setRcsTime(new Date());
--
Gitblit v1.9.1