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/device/service/impl/DeviceInteractionServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceInteractionServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceInteractionServiceImpl.java
index 73cb33a..3d52809 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceInteractionServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceInteractionServiceImpl.java
@@ -38,7 +38,7 @@
     @Override
     public DevicePlcVO.OperationResult feedGlass(DeviceGlassFeedRequest request) {
         // 浼樺厛浣跨敤鏂扮殑澶勭悊鍣ㄦ灦鏋�
-        DeviceConfig deviceConfig = deviceConfigService.getDeviceById(request.getDeviceId());
+        DeviceConfig deviceConfig = deviceConfigService.getDeviceById(request.getId());
         if (deviceConfig != null) {
             DeviceLogicHandler handler = handlerFactory.getHandler(deviceConfig.getDeviceType());
             if (handler != null) {
@@ -53,13 +53,13 @@
         }
 
         // 闄嶇骇鍒板師鏈夐�昏緫锛堝吋瀹规棫浠g爜锛�
-        DeviceControlProfile profile = controlProfileService.getProfile(request.getDeviceId());
+        DeviceControlProfile profile = controlProfileService.getProfile(request.getId());
         Map<String, Object> payload = buildGlassPayload(profile, request);
         String opName = "鐜荤拑涓婃枡";
         if (request.getPositionCode() != null) {
             opName = opName + "(" + request.getPositionCode() + ")";
         }
-        return devicePlcOperationService.writeFields(request.getDeviceId(), payload, opName);
+        return devicePlcOperationService.writeFields(request.getId(), payload, opName);
     }
 
     /**

--
Gitblit v1.8.0