From 9c3dcce4b913a8eb90883ee7837629327efdf6d9 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 30 十月 2025 13:37:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/config/S7Config.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/config/S7Config.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/config/S7Config.java
index 637effc..7efc0fe 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/config/S7Config.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/config/S7Config.java
@@ -15,15 +15,15 @@
public class S7Config {
@Bean(name = "s7SerializerSPOne")
public S7Serializer s7SerializerSPOne() {
-// S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.15");
- S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
+ S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.15");
+// S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
return S7Serializer.newInstance(s7PLC);
}
@Bean(name = "s7SerializerSPTwo")
public S7Serializer s7SerializerSPTwo() {
-// S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.21");
- S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
+ S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.21");
+// S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
return S7Serializer.newInstance(s7PLC);
}
--
Gitblit v1.8.0