From b7e27e0760d7a912de932dc24cb49a5302530355 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 二月 2026 09:30:55 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
index a644e6f..684b1a4 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
@@ -1,6 +1,10 @@
package com.zy.core.operation.handler;
+import com.core.common.DateUtils;
+import com.zy.asrs.controller.vo.OpenBusSubmitParam;
+import com.zy.asrs.controller.vo.TaskDto;
import com.zy.asrs.entity.Job;
+import com.zy.asrs.service.CtuMainService;
import com.zy.asrs.service.JobService;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ConveyorStateType;
@@ -15,6 +19,10 @@
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;
/**
* 鍙戦�佷换鍔＄粰RCS
@@ -31,13 +39,16 @@
private JobService jobService;
+ @Autowired
+ private CtuMainService ctuMainService;
+
@Override
public ConveyorStateType getType() {
return ConveyorStateType.SENDTASK;
}
@Override
- public void execute(CtuOperationConfig config) {
+ public synchronized void execute(CtuOperationConfig config) {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -57,9 +68,26 @@
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (job != null && job.getJobSts() == 4) {
- job.setJobSts(5);
- jobService.updateById(job);
+ if (job != null && job.getJobSts() == 5) {
+ OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
+ openBusSubmitParam.setBatchNo(job.getBatchNo());
+ List<TaskDto> taskList = new ArrayList<>();
+ TaskDto taskDto = new TaskDto();
+ taskDto.setTaskNo(job.getInTaskNo());
+ taskDto.setBatchNo(job.getBatchNo());
+ taskDto.setOriSta(job.getStaNo());
+ taskDto.setDestLoc(job.getLoc());
+ taskDto.setPriority(1);
+ taskList.add(taskDto);
+ openBusSubmitParam.setTasks(taskList);
+ if (ctuMainService.sendTask(openBusSubmitParam)) {
+ job.setJobSts(7);
+ job.setRcsTime(new Date());
+ jobService.updateById(job);
+ log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛," + job.getInTaskNo() + " - " + job.getJobNo());
+ } else {
+ log.info("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getInTaskNo() + " - " + job.getJobNo());
+ }
}
}
}
--
Gitblit v1.9.1