#

TQS

2024-08-15 78bb4bd47e4d492ff75cc407c574ff75db199afe

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

@@ -854,7 +854,9 @@
                                    continue;
                                }
                                WrkMast onlyWrkNo = wrkMastMapper.selectByOnlyWrkNo(crnProtocol.getTaskNo().intValue());
                                if (Cools.isEmpty(onlyWrkNo)){
                                if (Cools.isEmpty(onlyWrkNo) ||
                                        (onlyWrkNo.getStaNo()!=114 && onlyWrkNo.getStaNo()!=214 &&
                                        onlyWrkNo.getSourceStaNo()!=114 && onlyWrkNo.getSourceStaNo()!=214)){
                                    continue;
                                }
                                //  判断堆垛机状态等待确认
@@ -864,6 +866,8 @@
                                        && crnProtocol.getBay().equals(crnStn.getBay().shortValue()) && crnProtocol.getLevel().equals(crnStn.getLev().shortValue())) {
                                    News.info("堆垛机接驳任务完成，工作号："+crnProtocol.getTaskNo()+"；执行堆垛机号："+crnSlave.getId()+"；接驳放货位："+crnStn.getStaNo()+"；接驳行走目标站："+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()));
                                    // 下发站点信息
                                    News.error("new867===>"+crnProtocol.getTaskNo());
                                    News.error("new867===>"+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).toString());
                                    staProtocol.setWorkNo(crnProtocol.getTaskNo());
                                    staProtocol.setStaNo(Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).shortValue());
                                    if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
@@ -875,7 +879,7 @@
                                }
                            }
                        } catch (Exception e){
                            News.info("堆垛机接驳任务完成，一场："+e.getMessage());
                            News.info("堆垛机接驳任务完成，异常："+e.getMessage());
                        }
                        continue;
                    }
@@ -899,6 +903,8 @@

                        // 下发站点信息
                        staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                        News.error("new902===>"+crnProtocol.getCrnNo().toString());
                        News.error("new902===>"+wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).toString());
                        staProtocol.setStaNo(wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).shortValue());
                        if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
                            continue;
@@ -1040,7 +1046,7 @@
                    }
                    continue;
                } catch (Exception e){
                    News.info("堆垛机接驳任务执行，一场："+e.getMessage());
                    News.info("堆垛机接驳任务执行，异常："+e.getMessage());
                }
                continue;
            }