输送线改造

zyx

2024-02-07 0dc90999cbac38a3afb55ab7b9f3578a6f0d58ce

输送线改造

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

@@ -254,8 +254,8 @@
        taskDtos.forEach(taskDto -> {

            //判断是否有重复料想的工作当
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
            if(!Cools.isEmpty(agvWrkMast)){
            List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
            if(!Cools.isEmpty(agvWrkMastList)){
                return;
            }


 src/main/java/com/zy/common/web/WcsController.java

@@ -65,6 +65,8 @@
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private AgvWrkDetlService agvWrkDetlService;
//    @Autowired
//    private ErpService erpService;

@@ -680,12 +682,12 @@
        //查找该容器的工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast)){
            return R.ok(agvWrkMast);
            return R.ok(agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo()));
        }
        //查找该容器的入库通知档
        AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWaitPakin)){
            return R.ok(agvWaitPakin);
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
        if(!Cools.isEmpty(agvWaitPakinList)){
            return R.ok(agvWaitPakinList);
        }

        return R.error("没有该容器的出库、拣料、入库信息等");