From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
index aead560..909861f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
@@ -11,6 +11,7 @@
import com.mes.interaction.workstation.config.WorkstationLogicConfig;
import com.mes.plc.client.PlcClient;
import com.mes.plc.factory.PlcClientFactory;
+import com.mes.task.model.TaskExecutionContext;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -113,7 +114,7 @@
Map<String, Object> logicParams,
Map<String, Object> params) {
- String deviceId = deviceConfig.getDeviceId();
+ String deviceId = String.valueOf(deviceConfig.getId());
PlcClient plcClient = getPlcClient(deviceConfig);
if (plcClient == null) {
return buildResult(deviceConfig, "checkAndProcess", false,
@@ -192,16 +193,15 @@
try {
if (params != null) {
Object ctxObj = params.get("_taskContext");
- if (ctxObj instanceof com.mes.task.model.TaskExecutionContext) {
- com.mes.task.model.TaskExecutionContext ctx =
- (com.mes.task.model.TaskExecutionContext) ctxObj;
+ if (ctxObj instanceof TaskExecutionContext) {
+ TaskExecutionContext ctx = (TaskExecutionContext) ctxObj;
List<String> batchGlassIds = batch.stream()
.map(GlassInfo::getGlassId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (!batchGlassIds.isEmpty()) {
ctx.getSharedData().put("transferReadyGlassIds",
- new java.util.ArrayList<>(batchGlassIds));
+ new ArrayList<>(batchGlassIds));
log.info("鍗ц浆绔嬪凡杈撳嚭鎵规鐜荤拑鍒颁换鍔′笂涓嬫枃: deviceId={}, glassIds={}",
deviceConfig.getId(), batchGlassIds);
}
@@ -482,7 +482,7 @@
WorkstationLogicConfig config,
Map<String, Object> logicParams) {
- String deviceId = deviceConfig.getDeviceId();
+ String deviceId = String.valueOf(deviceConfig.getId());
// 鍋滄鏃х殑鐩戞帶浠诲姟
handleStopMonitor(deviceConfig);
@@ -513,7 +513,7 @@
* 鍋滄鐩戞帶浠诲姟
*/
private DevicePlcVO.OperationResult handleStopMonitor(DeviceConfig deviceConfig) {
- String deviceId = deviceConfig.getDeviceId();
+ String deviceId = String.valueOf(deviceConfig.getId());
ScheduledFuture<?> future = monitorTasks.remove(deviceId);
if (future != null && !future.isCancelled()) {
future.cancel(false);
@@ -526,7 +526,7 @@
* 娓呯┖缂撳啿闃熷垪
*/
private DevicePlcVO.OperationResult handleClearBuffer(DeviceConfig deviceConfig) {
- String deviceId = deviceConfig.getDeviceId();
+ String deviceId = String.valueOf(deviceConfig.getId());
glassBuffer.remove(deviceId);
lastScanTime.remove(deviceId);
log.info("宸叉竻绌虹紦鍐查槦鍒�: deviceId={}", deviceId);
--
Gitblit v1.8.0