Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

zjj

2025-06-11 da4f2304da2646aa0336b492514655e7cc8a494a

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

@@ -157,8 +157,8 @@
            if (result.IsSuccess) {
                if (null == crnProtocol) {
                    crnProtocol = new CrnProtocol();
                    crnProtocol.setCrnNo(slave.getId());
                }
                crnProtocol.setCrnNo(slave.getId());
                crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -185,8 +185,8 @@

                // 复位信号
                if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
//                    News.error("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 状态为10，等待确认！！",
//                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物");
                    News.error("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{},状态:{}]==>> 状态为10，等待确认！！",
                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物",crnProtocol.getStatusType());
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){
                            backHpFlag = false;
@@ -247,11 +247,13 @@
        do {
            OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
            if (resultAck.IsSuccess){
                Thread.sleep(200);
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
                short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
                if (ack != 0) {
                    writeAck++;
                }else {
                    News.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), "ack复位完成");
                    break;
                }
            }
@@ -304,12 +306,13 @@
                    one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
                    one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                    one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
                    one.setCommand(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
                    one.setTraySize(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
                    if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
                            || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
                            || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                            || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                            || !command.getTraySize().equals(one.getTraySize())
                            || !command.getTraySize().equals(one.getTraySize()) || !command.getCommand().equals(one.getCommand())
                            || !command.getAckFinish().equals(one.getAckFinish())
                    ){
                        try{
@@ -351,6 +354,7 @@
                    if(result.IsSuccess){
                        //堆垛机任务写入后，回读一次，看是否成功
                        Thread.sleep(200);
                        log.info("堆垛机任务完成复位，此时堆垛机状态:"+crnProtocol.getStatusType()+",堆垛机id:"+crnProtocol.getCrnNo());
                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
                        if (resultRead.IsSuccess) {
                            commandFinish=siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);