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

Junjie

2025-06-19 b48ad13253c050e9e42360456fe8eff5f6fc3fcb

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

@@ -287,11 +287,20 @@
        do {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 4);
            if (resultRead.IsSuccess) {
                short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
                if(taskNo == 0) {
                    result = siemensNet.Write("DB100.0", array);
                if (command.getAckFinish() == 0) {
                    short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
                    if(taskNo == 0) {
                        result = siemensNet.Write("DB100.0", array);
                    }else {
                        break;
                    }
                }else {
                    break;
                    short ackFinish = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
                    if(ackFinish != command.getAckFinish()) {
                        result = siemensNet.Write("DB100.0", array);
                    }else {
                        break;
                    }
                }
            }
            idx++;
@@ -316,6 +325,7 @@
            } while (i < 5);
        }

        this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
        try {
            // 日志记录
            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
@@ -427,6 +437,7 @@
            } while (i < 5);
        }

        this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
        try {
            // 日志记录
            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);