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/SendTaskOperationHandler.java | 127 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 0 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
new file mode 100644
index 0000000..29117c0
--- /dev/null
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
@@ -0,0 +1,127 @@
+package com.zy.acs.conveyor.core.operation.handler;
+
+
+import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
+import com.zy.acs.conveyor.controller.vo.TaskDto;
+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.CtuMainService;
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍙戦�佷换鍔＄粰RCS
+ */
+@Slf4j
+@Component
+public class SendTaskOperationHandler implements OperationHandler {
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+
+ @Autowired
+ private JobService jobService;
+
+
+ @Autowired
+ private CtuMainService ctuMainService;
+
+
+ @Autowired
+ private StationService stationService;
+
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+
+ @Override
+ public ConveyorStateType getType() {
+ return ConveyorStateType.SENDTASK;
+ }
+
+ @Override
+ public synchronized void execute(CtuOperationConfig config) {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
+ StaProtocol staProtocol = stationMap.get(inSta.getTargetSta());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (!staProtocol.isLoading()) {
+ if (staProtocol.getWorkNo() > 0) {
+ log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ }
+ continue;
+ }
+ if (staProtocol.getWorkNo() == 0) {
+ log.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ continue;
+ }
+ if (staProtocol.isAutoing()) {
+ 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());
+ jobService.updateById(job);
+ log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", job.getTaskNo(), job.getJobNo());
+ } else {
+ log.info("浠诲姟鍙戦�佺粰RCS澶辫触,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", job.getTaskNo(), job.getJobNo());
+ }
+ }
+ } else {
+ log.error("杈撻�佺嚎涓鸿嚜鍔紝闇�瑕佸紑鍚細{}", staProtocol.getSiteId());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ /**
+ * 澶勭悊浠诲姟
+ *
+ * @param job
+ * @return
+ */
+ private OpenBusSubmitParam process(Job job) {
+ OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
+ openBusSubmitParam.setBatchNo(job.getBatchNo());
+ List<TaskDto> taskList = new ArrayList<>();
+ TaskDto taskDto = new TaskDto();
+ taskDto.setTaskNo(job.getTaskNo());
+ taskDto.setBatchNo(job.getBatchNo());
+ taskDto.setOriSta(job.getStaNo());
+ taskDto.setDestLoc(job.getLoc());
+ taskDto.setPriority(1);
+ taskList.add(taskDto);
+ openBusSubmitParam.setTasks(taskList);
+ return openBusSubmitParam;
+ }
+}
--
Gitblit v1.9.1