Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-17 b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6

 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);
    }