AGV调试整改

zyx

2023-10-04 45c2bf51fae3030c8e22fa2f2016b64a28928547

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

@@ -5,6 +5,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.mapper.AgvBasDevpMapper;
import com.zy.asrs.service.AgvBasDevpService;
@@ -108,19 +109,34 @@
                AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
                BeanUtils.copyProperties(agvBasDevp, agvBasDevpDto);

                if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
                //如果工作位状态为0.空库位,则直接返回
                if("O".equals(agvBasDevpDto.getLocSts())){
                    return agvBasDevpDto;
                }

                AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
                        .eq("zpallet", agvBasDevpDto.getBarcode()));

                agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);

                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                        .eq("barcode", agvBasDevpDto.getBarcode()));
                        .eq("loc_no", agvBasDevpDto.getDevNo())
                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));

                agvBasDevpDto.setAgvWrkMast(agvWrkMast);

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

                    agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);

                    if(Cools.isEmpty(agvWaitPakin)){
                        AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
                                eq("wrk_no",agvWrkMast.getWrkNo()));

                        agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
                    }
                }

                if(!Cools.isEmpty(agvWrkMast)){
                    setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
                }

                return agvBasDevpDto;

@@ -136,4 +152,29 @@
        return result;
    }

    private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示容器离场按钮
        if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setContainerMoveOutFlag(true);
        }

        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示容器离场按钮
        if(agvWrkMast.getIoType() == 110 && "D".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setContainerMoveOutFlag(true);
        }

        //当工作档类型为103.拣料出库 并且 工作位状态为F.在库时，显示拣料/盘点入库按钮
        if(agvWrkMast.getIoType() == 103 && "F".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setPickInFlag(true);
        }
        //当工作档类型为107.盘点出库 并且 工作位状态为F.在库时，显示拣料/盘点入库按钮
        if(agvWrkMast.getIoType() == 107 && "F".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setPickInFlag(true);
        }
    }

    public List<String> getAvailableEmptyInSite() {
        return this.baseMapper.getAvailableEmptyInSite();
    }

}