可视化站点注释

zyx

2023-12-14 c8a3ec588628bdd3f223eb067cf0c35be687d98f

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

@@ -120,6 +120,7 @@
                    return agvBasDevpDto;
                }

                //一个工作位可能会对应多个工作档，显示工作状态最大的工作档
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                        .eq("loc_no", agvBasDevpDto.getDevNo())
                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));
@@ -142,11 +143,15 @@
                    List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
                            .eq("supp_code", agvBasDevpDto.getBarcode()));

                    //如果有入库通知档，则该工作位为入库作业
                    if(!Cools.isEmpty(agvWaitPakinList)){
                        //用于电视机显示
                        agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
                        //用于可视化站点显示
                        agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
                    }

                    //如果没有入库通知档，则该工作位为出库作业
                    if(Cools.isEmpty(agvWaitPakinList)){
                        List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

@@ -156,8 +161,8 @@
                            if(agvWrkMast.getIoType() == 103){
                                //寻找是否有相同物料的工作档明细，并返回数量之和
                                double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);

                                AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                                //用于结余数量显示
                                agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
                            }
                            if(agvWrkMast.getIoType() == 53){
@@ -167,7 +172,9 @@
                        }

                        if(!Cools.isEmpty(agvWrkDetlList)){
                            //用于电视机显示
                            agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
                            //用于可视化站点显示
                            agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
                        }