From 14717fd672bc62442175d2ce2ddd3a113f0069b8 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 19:24:18 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index 58cffdc..1e89ca8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -24,6 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.Date;
import java.util.Map;
@Slf4j
@@ -72,27 +73,31 @@
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (!staProtocol.isAutoing()) {
- News.error("{},杈撻�佺嚎鏈嚜鍔紝闇�瑕佸紑鍚細{}", config.getMark(), staProtocol.getSiteId());
+ //News.error("{},杈撻�佺嚎鏈嚜鍔紝闇�瑕佸紑鍚細{}", config.getMark(), staProtocol.getSiteId());
continue;
}
if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
String seqNum = ctuMainService.checkStationStatus(putSta.getStaNo());
if (seqNum != null) {
- staProtocol.setSafeSignal(new SafeSignal( devp.getPutSta().indexOf(putSta) ,true));
- redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocol );
Job job = jobService.getJobByTaskNo(seqNum);
if (job != null) {
News.error("{}锛氱珯鐐癸細{}锛屽瓨鍦ㄤ换鍔�,{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
continue;
}
+
+ staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(putSta), true, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
+
+
int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(putSta.getTargetSta());
job = new Job();
job.setTaskNo(seqNum);
job.setJobNo(workNo);
+ job.setCreateTime(new Date());
job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
if (!jobService.insert(job)) {
throw new CoolException("鎻掑叆杈撻�佺嚎浠诲姟澶辫触," + seqNum + " - " + workNo);
@@ -102,8 +107,6 @@
} else {
News.error("{},绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", config.getMark(), staProtocol.getSiteId());
}
- } else {
- News.error("{},绔欑偣锛歿},寮傚父鐘舵�侊紝璇疯ˉ鍏�", config.getMark(), staProtocol.getSiteId());
}
}
}
--
Gitblit v1.9.1