From b0a96a43d99eb5baf708c4fa0d0482696d7b0823 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 19:55:26 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 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 57c5a79..1e3e4cf 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
@@ -1,28 +1,30 @@
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;
+import com.zy.acs.conveyor.core.enums.ConveyorStateType;
+import com.zy.acs.conveyor.core.model.SafeSignal;
+import com.zy.acs.conveyor.core.model.StaProtocol;
+import com.zy.acs.conveyor.core.operation.OperationHandler;
+import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.CtuMainService;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.conveyor.service.WrkLastnoService;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
-import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
-import com.zy.acs.conveyor.core.operation.OperationHandler;
-import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
-import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Map;
@Slf4j
@Component
@@ -41,6 +43,11 @@
@Autowired
private JobService jobService;
+ @Autowired
+ private StationService stationService;
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
@Override
public ConveyorStateType getType() {
@@ -54,52 +61,46 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍑哄簱鍙�
- for (DevpSlave.Sta releaseSta : devp.getReleaseSta()) {
+ for (DevpSlave.Sta putSta : devp.getPutSta()) {
// 鑾峰彇鍏ュ簱绔欎俊鎭�
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(releaseSta.getStaNo());
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
+ StaProtocol staProtocol = stationMap.get(putSta.getStaNo());
if (staProtocol == null) {
continue;
} else {
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
- if (!staProtocol.isLoading()) {
- if (staProtocol.getWorkNo() > 0) {
- log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
- }
+ if (!staProtocol.isAutoing()) {
+ News.error("{},杈撻�佺嚎鏈嚜鍔紝闇�瑕佸紑鍚細{}", config.getMark(), staProtocol.getSiteId());
continue;
}
- if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
- if (staProtocol.isInEnable()) {
- log.error("娌℃湁鍙叆淇″彿锛歿}", staProtocol.getSiteId());
- continue;
- }
- String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
+ if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
+ String seqNum = ctuMainService.checkStationStatus(putSta.getStaNo());
if (seqNum != null) {
- Job jobBySeqNum = jobService.getJobByTaskNo(seqNum);
- if (jobBySeqNum == null) {
- int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
- // 涓嬪彂绉诲姩 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(releaseSta.getTargetSta());
- Job job = new Job();
- job.setTaskNo(seqNum);
- job.setJobNo(workNo);
- job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
- if (!jobService.insert(job)) {
- throw new CoolException("鎻掑叆杈撻�佺嚎浠诲姟澶辫触," + jobBySeqNum + " - " + workNo);
- }
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol));
- if (result) {
- log.info("杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());
- } else {
- log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
- }
+ staProtocol.setSafeSignal(new SafeSignal( devp.getPutSta().indexOf(putSta) ,(short)1,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;
}
+ 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.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
+ if (!jobService.insert(job)) {
+ throw new CoolException("鎻掑叆杈撻�佺嚎浠诲姟澶辫触," + seqNum + " - " + workNo);
+ }
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ News.info("{},杈撻�佺嚎涓嬪彂锛歿},{}", config.getMark(), staProtocol.getWorkNo(), putSta.getTargetSta());
} else {
- log.info("绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", staProtocol.getSiteId());
+ News.error("{},绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", config.getMark(), staProtocol.getSiteId());
}
}
}
--
Gitblit v1.9.1