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/vehicle/coordination/VehicleCoordinationService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/coordination/VehicleCoordinationService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/coordination/VehicleCoordinationService.java
index 118e7f3..80f25f5 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/coordination/VehicleCoordinationService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/coordination/VehicleCoordinationService.java
@@ -93,7 +93,7 @@
         
         if (deviceConfig != null) {
             log.info("閫夋嫨鍙敤杞﹁締: deviceId={}, deviceName={}", 
-                deviceConfig.getDeviceId(), deviceConfig.getDeviceName());
+                String.valueOf(deviceConfig.getId()), deviceConfig.getDeviceName());
         }
         
         return deviceConfig;
@@ -172,7 +172,7 @@
      */
     public List<DeviceConfig> getAvailableVehiclesInGroup(Long groupId) {
         return getVehiclesInGroup(groupId).stream()
-            .filter(v -> statusManager.isVehicleAvailable(v.getDeviceId()))
+            .filter(v -> statusManager.isVehicleAvailable(String.valueOf(v.getId())))
             .collect(Collectors.toList());
     }
     

--
Gitblit v1.8.0