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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 9db7993..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
@@ -114,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,
@@ -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