From ab389a5a6b329b15a655340ba7b87bce7fd7871d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 24 十二月 2025 17:16:19 +0800
Subject: [PATCH] 添加新增设备自动生成编码
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/base/WorkstationBaseHandler.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/base/WorkstationBaseHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/base/WorkstationBaseHandler.java
index c37bb7a..2bf2f6e 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/base/WorkstationBaseHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/base/WorkstationBaseHandler.java
@@ -38,7 +38,7 @@
config.setScanIntervalMs(getLogicParam(logicParams, "scanIntervalMs", 10_000));
config.setTransferDelayMs(getLogicParam(logicParams, "transferDelayMs", 30_000));
config.setVehicleCapacity(getLogicParam(logicParams, "vehicleCapacity", 6000));
- config.setAutoAck(getLogicParam(logicParams, "autoAck", Boolean.TRUE));
+ config.setGlassGap(getLogicParam(logicParams, "glassGap", 200));
return config;
}
@@ -46,10 +46,10 @@
* 榛樿瀹炵幇锛氭彁绀哄皻鏈疄鐜板叿浣撻�昏緫
*/
@Override
- protected DevicePlcVO.OperationResult doExecute(com.mes.device.entity.DeviceConfig deviceConfig,
+ protected DevicePlcVO.OperationResult doExecute(DeviceConfig deviceConfig,
String operation,
- java.util.Map<String, Object> params,
- java.util.Map<String, Object> logicParams) {
+ Map<String, Object> params,
+ Map<String, Object> logicParams) {
log.warn("褰撳墠璁惧閫昏緫灏氭湭瀹炵幇: deviceType={}, operation={}", deviceConfig.getDeviceType(), operation);
return DevicePlcVO.OperationResult.builder()
.success(false)
@@ -69,11 +69,11 @@
defaults.put("scanIntervalMs", 10_000);
defaults.put("transferDelayMs", 30_000);
defaults.put("vehicleCapacity", 6_000);
- defaults.put("autoAck", true);
+ defaults.put("glassGap", 200);
try {
return objectMapper.writeValueAsString(defaults);
} catch (JsonProcessingException e) {
- return "{\"scanIntervalMs\":10000,\"transferDelayMs\":30000,\"vehicleCapacity\":6000,\"autoAck\":true}";
+ return "{\"scanIntervalMs\":10000,\"transferDelayMs\":30000,\"vehicleCapacity\":6000,\"glassGap\":200}";
}
}
}
--
Gitblit v1.8.0