From 14717fd672bc62442175d2ce2ddd3a113f0069b8 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 19:24:18 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 6532e8a..000c699 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
@@ -6,6 +6,7 @@
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.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;
@@ -63,16 +64,20 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.Sta inSta : devp.getInSta()) {
+ for (DevpSlave.Sta sta : devp.getTakeSta()) {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
- StaProtocol staProtocol = stationMap.get(inSta.getTargetSta());
+ StaProtocol staProtocol = stationMap.get(sta.getSourceStaNo());
if (staProtocol == null) {
continue;
} else {
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (!staProtocol.isAutoing() ||staProtocol.getWorkNo() ==0) {
+ //News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
News.error("{},杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), staProtocol.getSiteId());
continue;
@@ -81,21 +86,14 @@
News.error("{},杈撻�佺嚎涓婃棤璐ф湁浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), staProtocol.getSiteId());
continue;
}
- 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()){
+ if (jobByJobNo.getJobSts() == ConveyorStateType.SENDTASK.getStatus()) {
continue;
}
News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
@@ -106,6 +104,9 @@
jobByJobNo.setJobSts(ConveyorStateType.SENDTASK.getStatus());
jobByJobNo.setRcsTime(new Date());
jobService.updateById(jobByJobNo);
+ staProtocol.setWorkNo(staProtocol.getWorkNo());
+ staProtocol.setStaNo(sta.getTargetSta());
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
News.error("{},浠诲姟鍙戦�佺粰RCS鎴愬姛,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
} else {
News.error("{},浠诲姟鍙戦�佺粰RCS澶辫触,WMS浠诲姟鍙凤細{},杈撻�佺嚎宸ヤ綔鍙凤細{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
--
Gitblit v1.9.1