From 636eec68dd5b988ea1b753a9b7ebc39f23eb501a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 十月 2025 07:55:56 +0800
Subject: [PATCH] 1、修改932线出片类型判断 2、钢化，仓储修改websocket推送方式
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/config/S7Config.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/config/S7Config.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/config/S7Config.java
index e05f63c..91999e3 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/config/S7Config.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/config/S7Config.java
@@ -16,22 +16,22 @@
@Bean(name = "s7SerializerCC")
public S7Serializer s7SerializerCC() {
-// S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.80");
- S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
+ S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.10.80");
+// S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191");
return S7Serializer.newInstance(s7PLC);
}
@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