From f7371a4a3413ec37931b26a95b7b0290a46219f2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 15:18:56 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java | 88 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 0 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
new file mode 100644
index 0000000..179651b
--- /dev/null
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
@@ -0,0 +1,88 @@
+package com.zy.acs.conveyor.core.operation.handler;
+
+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.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.service.JobService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Map;
+
+
+/**
+ * 娓呯悊绔欑偣淇″彿
+ */
+@Slf4j
+@Component
+public class ClearSingleOperationHandler implements OperationHandler {
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+
+ @Autowired
+ private JobService jobService;
+
+
+ @Autowired
+ private StationService stationService;
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+
+ @Override
+ public ConveyorStateType getType() {
+ return ConveyorStateType.CLEARSIGNAL;
+ }
+
+ @Override
+ public synchronized void execute(CtuOperationConfig config) {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻绛夊緟ctu鍙栬揣绔�
+ for (DevpSlave.Sta takeSta : devp.getTakeSta()) {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
+ StaProtocol staProtocol = stationMap.get(takeSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (staProtocol.isLoading()) {
+ continue;
+ }
+ if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
+ 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);
+
+ log.info("" + config.getMark() + "绔欑偣娓呯┖澶辫触锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
+ job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
+ jobService.updateById(job);
+
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+}
--
Gitblit v1.9.1