Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

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

@@ -100,8 +100,11 @@
                    .eq("station_code", stationCode)
                    .like("dev_no", "0" + i + "@");

            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "CS-307".equals(stationCode)){
                wrapper.orderBy("dev_no",false);
            List<String> list = this.selectCacheShelvesStationCodeByFloor(3);
            if(list.contains(stationCode)){
                if(Cools.eq(stationCode,"CS-305") || Cools.eq(stationCode,"CS-306") || Cools.eq(stationCode,"CS-307")){
                    wrapper.orderBy("dev_no",false);
                }
            }

            List<AgvBasDevp> agvBasDevpList = this.selectList(wrapper);
@@ -117,33 +120,68 @@
                    return agvBasDevpDto;
                }

                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                //一个工作位可能会对应多个工作档，显示工作状态最大的工作档
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                        .eq("loc_no", agvBasDevpDto.getDevNo())
                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));

                AgvWrkMast agvWrkMast = null;
                for (AgvWrkMast wrkMast : agvWrkMasts){
                    if(Cools.isEmpty(agvWrkMast)){
                        agvWrkMast = wrkMast;
                    }else {
                        if(agvWrkMast.getWrkSts() < wrkMast.getWrkSts()){
                            agvWrkMast = wrkMast;
                        }
                    }
                }

                agvBasDevpDto.setAgvWrkMast(agvWrkMast);

                if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
                    AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
                    //AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevpDto.getBarcode()));
                    List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
                            .eq("supp_code", agvBasDevpDto.getBarcode()));

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

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

                        //agv站点可视化管理中的结余数量显示
                        agvWrkDetl.setVolume(0.0);
                        if(agvWrkMast.getIoType() == 103){
                            AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
                            agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                        for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){
                            agvWrkDetl.setVolume(0.0);
                            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){
                                AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                                if(Cools.isEmpty(agvLocDetl)){
                                    agvWrkDetl.setVolume(0.0);
                                }else {
                                    agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                                }
                            }
                        }
                        if(agvWrkMast.getIoType() == 53){
                            AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
                            agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                            //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());

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

                    }
                }

@@ -163,6 +201,19 @@
        result.put("body", body);

        return result;
    }

    private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
        double allAnfme = 0;
        for (AgvWrkDetl wd1 : agvWrkDetlList){
            if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
                    && Cools.eq(wd0.getBatch(),wd1.getBatch())
                    && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
                    && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
                allAnfme += wd1.getAnfme();
            }
        }
        return allAnfme;
    }

    private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
@@ -201,4 +252,24 @@
                .eq("loc_sts", "O"));
    }

    @Override
    public List<AgvBasDevp> getBasDevpByNoCacheShelves() {
        return this.selectList(new EntityWrapper<AgvBasDevp>().eq("cache_shelves","N"));
    }

    @Override
    public List<String> selectCacheShelvesStationCodeByFloor(int floor) {
        //Object o = this.selectList(new EntityWrapper<AgvBasDevp>().setSqlSelect("station_code").eq("floor",floor).eq("cache_shelves","Y").groupBy("station_code"));
        return this.baseMapper.selectCacheShelvesStationCodeByFloor(floor);
    }

    public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){
        return this.baseMapper.selectDevNoAndNumBystationCode(stationCode);
    }

    @Override
    public List<String> selectAllStationCode() {
        return this.baseMapper.selectAllStationCode();
    }

}