From 286eadc0913fe9974ab2f2fd188fb707dc16ad40 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 二月 2026 09:16:14 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 684b1a4..760106d 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,5 @@
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;
@@ -58,37 +57,35 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(inSta.getTargetSta());
if (staProtocol == null) {
- return;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (!staProtocol.isLoading()) {
- return;
+ if (staProtocol.getWorkNo() > 0) {
+ log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ }
+ continue;
}
- if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
+ if (staProtocol.getWorkNo() == 0) {
+ log.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ continue;
+ }
+ if (staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
- 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);
+ if (job != null && job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
+ if (ctuMainService.sendTask(process(job))) {
+ job.setJobSts(ConveyorStateType.SENDTASK.getStatus());
job.setRcsTime(new Date());
jobService.updateById(job);
- log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛," + job.getInTaskNo() + " - " + job.getJobNo());
+ log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", job.getTaskNo(), job.getJobNo());
} else {
- log.info("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getInTaskNo() + " - " + job.getJobNo());
+ log.info("浠诲姟鍙戦�佺粰RCS澶辫触,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", job.getTaskNo(), job.getJobNo());
}
}
+ } else {
+ log.error("杈撻�佺嚎涓鸿嚜鍔紝闇�瑕佸紑鍚細{}", staProtocol.getSiteId());
}
}
}
@@ -97,4 +94,25 @@
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