#

tqs

2024-05-17 a1b2d866d146a3c4b7559c02c678977638178b9c

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1368,7 +1368,7 @@
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                News.warnNoLog(""+mark+" - 0"+" - 开始执行对工作档的完成操作");
                News.warnNoLog(""+mark+" - 0"+" - 开始执行对工作档的完成操作，任务号:"+crnProtocol.getTaskNo());

                    // 获取入库待确认工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());

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

@@ -195,6 +195,8 @@
                        crnCommand.setAckFinish((short)1);
                        if (write(crnCommand)) {
                            resetFlag = false;
                            News.error("-------------------------------------------第二步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 复位resetFlag标记成功{}！！",
                                    slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物",resetFlag);
                        }
                    }
                }
@@ -326,9 +328,9 @@
                            News.error("日志打印失败：===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                        }
                    }
                    News.error("堆垛机命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));

                    if(!resetFlag) {
                        News.error("堆垛机命令回读失败后，重新添加任务到队列 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
                        MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
                    }


 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 {