From 038634540d95d4a5787b80a1fbab131df4d99823 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 17:11:09 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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
index 29117c0..7a2e31d 100644
--- 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
@@ -1,6 +1,8 @@
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.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
@@ -71,31 +73,44 @@
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
- if (!staProtocol.isLoading()) {
- if (staProtocol.getWorkNo() > 0) {
- log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
- }
+ if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
+ News.error("{},杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), staProtocol.getSiteId());
continue;
}
- if (staProtocol.getWorkNo() == 0) {
- log.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ if (staProtocol.getWorkNo() > 0 && !staProtocol.isLoading()) {
+ News.error("{},杈撻�佺嚎涓婃棤璐ф湁浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), 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());
- }
+ if (!staProtocol.isAutoing()) {
+ News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (staProtocol.isInEnable()) {
+ News.error("{},绔欑偣锛歿},娌℃湁鍙叆淇″彿", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
+ if (jobByJobNo == null) {
+ News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (jobByJobNo.getJobSts() != ConveyorStateType.INBOUND.getStatus()) {
+ if (jobByJobNo.getJobSts() == ConveyorStateType.SENDTASK.getStatus()){
+ continue;
}
+ News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
+ continue;
+ }
+
+ if (ctuMainService.sendTask(process(jobByJobNo))) {
+ jobByJobNo.setJobSts(ConveyorStateType.SENDTASK.getStatus());
+ jobByJobNo.setRcsTime(new Date());
+ jobService.updateById(jobByJobNo);
+ News.error("{},浠诲姟鍙戦�佺粰RCS鎴愬姛,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
} else {
- log.error("杈撻�佺嚎涓鸿嚜鍔紝闇�瑕佸紑鍚細{}", staProtocol.getSiteId());
+ News.error("{},浠诲姟鍙戦�佺粰RCS澶辫触,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
}
+
}
}
} catch (Exception e) {
--
Gitblit v1.9.1