From b78572fb09a2c63398e8d87bd19d5d3f92f5aa58 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 15:17:26 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 973dc7a..3f3eb9c 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
@@ -1,27 +1,22 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.BarcodeThread;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
+import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.conveyor.service.WmsMainService;
import com.zy.acs.conveyor.service.WrkLastnoService;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -29,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Date;
+import java.util.Map;
/**
* 鍏ュ簱
@@ -51,6 +47,13 @@
private JobService jobService;
+ @Autowired
+ private StationService stationService;
+
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+
@Override
public ConveyorStateType getType() {
return ConveyorStateType.APPLYLOC;
@@ -65,9 +68,8 @@
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, devp.getId());
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
+ StaProtocol staProtocol = stationMap.get(inSta.getStaNo());
if (staProtocol == null) {
continue;
} else {
@@ -78,8 +80,8 @@
continue;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- String barcode = barcodeThread.getBarcode();
- if (barcodeThread == null || Cools.isEmpty(barcode)) {
+ String barcode = staProtocol.getBarcode();
+ if (Cools.isEmpty(barcode)) {
log.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
return;
}
@@ -93,13 +95,9 @@
Integer workNo = getWorkNo();
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(inSta.getTargetSta());
- if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
- if (!jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
- throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
- }
- log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
- } else {
- log.info("涓嬪彂澶辫触锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
+ log.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
}
} else {
log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
--
Gitblit v1.9.1