输送线改造

zyx

2024-02-07 0dc90999cbac38a3afb55ab7b9f3578a6f0d58ce

 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;

@@ -628,8 +630,17 @@
            currentContainerMap = new HashMap<>();
        }

        String devNo = param.getDevNo();
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
        }

        if(!Character.isDigit(containerCode.charAt(0))){
            containerCode = containerCode.substring(3,containerCode.length());
        }


        String devNo = param.getDevNo();
        String currentContainerCode = currentContainerMap.get(devNo);

        //判断容器是否发生变化
@@ -671,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("没有该容器的出库、拣料、入库信息等");