From 913604496c47484263604063e1fbb47778cb3795 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 18:43:42 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 13 +++++++------
zy-asc-conveyor/src/main/resources/application.yml | 2 ++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 4 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 5 ++---
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index b4d7e20..8685168 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -110,11 +110,11 @@
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
if (locOfWms != null) {
- Integer workNo = getWorkNo();
- staProtocol.setWorkNo(workNo);
+ staProtocol.setWorkNo(staProtocol.getWorkNo());
staProtocol.setStaNo(inSta.getTargetSta());
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
job.setLoc(locOfWms.getLocNo());
+ job.setStaNo(String.valueOf(inSta.getTargetSta()+1));
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
job.setBarcode(barcode);
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 c71bb1b..f23d270 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,10 +64,10 @@
// 鏍规嵁杈撻�佺嚎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 {
@@ -85,10 +86,7 @@
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());
@@ -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());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index 75b50bf..b78bd5b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -100,7 +100,7 @@
if (staProtocol.getWorkNo() == 0 && !staProtocol.isStartUpFlag()) {
- Job job = initJob(getWorkNo(), staProtocol.getSiteId() + "");
+ Job job = initJob(getWorkNo());
staProtocol.setWorkNo(job.getJobNo());
staProtocol.setStaNo(inSta.getStaNo());
staProtocol.setStartUpFlag(false);
@@ -118,9 +118,8 @@
}
}
- private Job initJob(Integer workNo, String staNo) {
+ private Job initJob(Integer workNo) {
Job job = new Job();
- job.setStaNo(staNo);
job.setJobNo(workNo);
job.setJobSts(ConveyorStateType.STARTUP.getStatus());
job.setStartTime(new Date());
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index f407296..68f37ff 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -125,6 +125,8 @@
targetSta: 1012
# ctu鍙栬揣绔欑偣
takeSta[0]:
+ # 婧愮珯鐐�
+ sourceStaNo: 1007
# 鏈珯鐐�
staNo: 1013
--
Gitblit v1.9.1