Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs

zyx

2024-01-31 ca8f5a8f133e7f5b00b9d35ff6d15720804569af

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

@@ -336,7 +336,7 @@
//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
        crnCommand.setCommand(command.getCommand());
        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
            command.setTaskNo((short) 9999);
            command.setTaskNo((short) 999);
        }

        command.setCrnNo(slave.getId());
@@ -454,7 +454,7 @@
//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
        crnCommand.setCommand(command.getCommand());
        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
            command.setTaskNo((short) 9999);
            command.setTaskNo((short) 999);
        }

        command.setCrnNo(slave.getId());