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/plc/factory/PlcClientFactory.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/plc/factory/PlcClientFactory.java b/mes-processes/mes-plcSend/src/main/java/com/mes/plc/factory/PlcClientFactory.java
index c207fab..8105c4d 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/plc/factory/PlcClientFactory.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/plc/factory/PlcClientFactory.java
@@ -118,10 +118,17 @@
         }
         
         // 鏍规嵁PLC绫诲瀷鍒涘缓涓嶅悓鐨勫鎴风
-        if (plcType.startsWith("S7")) {
+        // 鏀寔 S7_1200, S7_1500 绛夋牸寮忥紝涔熸敮鎸� S1200, S1500 绛夋牸寮�
+        String normalizedPlcType = plcType.toUpperCase();
+        if (normalizedPlcType.startsWith("S7") || 
+            normalizedPlcType.startsWith("S1200") || 
+            normalizedPlcType.startsWith("S1500") || 
+            normalizedPlcType.startsWith("S200") ||
+            normalizedPlcType.startsWith("S300") || 
+            normalizedPlcType.startsWith("S400")) {
             // S7鍗忚瀹㈡埛绔�
             return createS7Client(device);
-        } else if (plcType.equals("MODBUS")) {
+        } else if (normalizedPlcType.equals("MODBUS")) {
             // Modbus鍗忚瀹㈡埛绔�
             return createModbusClient(device);
         } else {

--
Gitblit v1.8.0