From 8f3a85044b6e4b56a8dd0b104ca023933f1f129c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 十二月 2025 16:58:36 +0800
Subject: [PATCH] 统一卧转立扫码、卧转立、大车、大理片笼的定时器逻辑和步骤状态；添加设备拓扑图清除数据、联机状态切换按钮，
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/scanner/handler/HorizontalScannerLogicHandler.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/scanner/handler/HorizontalScannerLogicHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/scanner/handler/HorizontalScannerLogicHandler.java
index fd1c2a1..7e25e57 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/scanner/handler/HorizontalScannerLogicHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/scanner/handler/HorizontalScannerLogicHandler.java
@@ -18,6 +18,7 @@
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -111,6 +112,8 @@
if (mesData == null || mesData.isEmpty()) {
log.error("绛夊緟MES鍐欏叆鐜荤拑淇℃伅瓒呮椂: deviceId={}, timeout={}ms",
deviceConfig.getId(), config.getScanIntervalMs());
+ // 瓒呮椂涔熻娓呯┖plcRequest
+ clearPlcRequestFields(deviceConfig, serializer);
return buildResult(deviceConfig, "scanOnce", false,
String.format("绛夊緟MES鍐欏叆鐜荤拑淇℃伅瓒呮椂(%dms)", config.getScanIntervalMs()), null);
}
@@ -118,6 +121,8 @@
// 3. 璇诲彇MES鍥炲啓鐨勭幓鐠冧俊鎭�
String glassId = parseString(mesData.get("mesGlassId"));
if (!StringUtils.hasText(glassId)) {
+ // MES鏈彁渚涚幓鐠僆D涔熻娓呯┖plcRequest
+ clearPlcRequestFields(deviceConfig, serializer);
return buildResult(deviceConfig, "scanOnce", false, "MES鍐欏尯鏈彁渚涚幓鐠僆D", null);
}
// 璇诲彇MES灏哄鏁版嵁锛歮esWidth=琛ㄥ锛宮esHeight=闀�
@@ -273,10 +278,15 @@
if (height != null) {
glassInfo.setGlassLength(height); // 闀�
}
- glassInfo.setStatus(GlassInfo.Status.ACTIVE);
+ glassInfo.setStatus(GlassInfo.Status.PENDING);
if (workLine != null) {
- glassInfo.setDescription("workLine=" + workLine);
+ glassInfo.setWorkLine(workLine);
}
+ Date now = new Date();
+ glassInfo.setCreatedTime(now);
+ glassInfo.setUpdatedTime(now);
+ glassInfo.setCreatedBy("system");
+ glassInfo.setUpdatedBy("system");
return glassInfo;
}
--
Gitblit v1.8.0