Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 8785b6b5ee9298308752b53bf546953ae49b8c88

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java

@@ -66,6 +66,7 @@
                s7PLC.writeUInt16(address, data);
                result = true;
            } catch (Exception ex) {
                System.out.println("向plc写命令过程中发生异常，原因为：" + ex.getMessage());
                reStartS7client();
            } finally {
                tryCount -= 1;