Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wangfei

2024-08-19 aac77d7ee28cc59aebce251b3c52243e3df6f003

 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;