Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

zjj

2024-06-19 d0dcc1dc625f41e8a674828a51a96dddc6f288e0

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -411,6 +411,7 @@
            Thread.sleep(200);
            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 目标站
            if(write.IsSuccess && write1.IsSuccess){
                log.error("写入输送线命令成功。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                break;
            }
            else {