From 038634540d95d4a5787b80a1fbab131df4d99823 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 17:11:09 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
index a03a113..960e0af 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
@@ -63,19 +64,35 @@
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (staProtocol.isLoading()) {
+ //News.error("{}锛氱珯鐐癸細{}锛屾湁鐗�", config.getMark(), staProtocol.getSiteId());
continue;
}
- if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
+ if (!staProtocol.isAutoing()) {
+ News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (staProtocol.getWorkNo() > 0) {
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (job != null && job.getJobSts() == ConveyorStateType.SENDTASK.getStatus()) {
- //String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
- staProtocol.setWorkNo(0);
- staProtocol.setStaNo(0);
- redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ if (job == null) {
+ News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (job.getJobSts() != ConveyorStateType.SENDTASK.getStatus()) {
+ if (job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus()){
+ continue;
+ }
+ News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
+ continue;
+ }
+ //String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo(0);
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
- job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
- jobService.updateById(job);
- //log.info("" + config.getMark() + "绔欑偣娓呯┖锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
+ job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
+ if (!jobService.updateById(job)){
+ log.info("" + config.getMark() + "绔欑偣娓呯┖澶辫触锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
+ }else {
News.info("" + config.getMark() + "绔欑偣娓呯┖锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
}
}
--
Gitblit v1.9.1