#

whycq

2024-05-24 4dfc306f910a8b1ae1a2869bc8ffd38b2faf8f2e

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

@@ -121,10 +121,10 @@

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
            case 1://满货架入库
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2);
                break;
            case 10://空托盘入库
            case 10://空货架入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
                break;
            case 103:// 拣料入库
@@ -137,7 +137,7 @@
            default:
                break;
        }
        log.info("/pakin/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        log.info("/pakin/loc/v1:"+dto + "======货架码:"+param.getBarcode());
        return R.ok().add(dto);
    }

@@ -199,10 +199,10 @@

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
            case 1://满货架入库
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
                break;
            case 10://空托盘入库
            case 10://空货架入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 103:// 拣料入库
@@ -213,7 +213,7 @@
            default:
                break;
        }
        log.info("/pakin/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        log.info("/pakin/loc/v1:"+dto + "======货架码:"+param.getBarcode());
        return R.ok().add(dto);
    }

@@ -255,13 +255,13 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setBarcode(barcode); // 货架码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 货架类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
@@ -367,7 +367,7 @@
        wrkMast.setLinkMis("Y");
        wrkMast.setBarcode(barcode);
//        wrkMast.setSteNo(findSte(wrkMast.getLocNo()));
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 货架类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
@@ -489,7 +489,7 @@
            }

            List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，修改库位状态O=>Q成功，库存明细：" + JSON.toJSONString(locDetls1));
            log.info("工作号：" + wrkMast.getWrkNo() + "，货架码：" + wrkMast.getBarcode() + "，修改库位状态O=>Q成功，库存明细：" + JSON.toJSONString(locDetls1));
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
@@ -644,21 +644,21 @@
        String devNo = param.getDevNo();
        String currentContainerCode = currentContainerMap.get(devNo);

        //判断容器是否发生变化
        //判断货架是否发生变化
        if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
            //查询旧容器的工作档
            //查询旧货架的工作档
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
            if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                //将工作党状态改为容器离场
                //将工作党状态改为货架离场
                agvWrkMast.setWrkSts(206L);
                agvWrkMastService.updateById(agvWrkMast);
//                //发送容器立场请求，完成工作档
//                //发送货架立场请求，完成工作档
//                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
//                agvWrkMastList.add(agvWrkMast);
//                try {
//                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
//                    if(code == 0){
//                        //将工作党状态改为容器离场
//                        //将工作党状态改为货架离场
//                        agvWrkMast.setWrkSts(206L);
//                        agvWrkMastService.updateById(agvWrkMast);
//                    }
@@ -685,7 +685,7 @@

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();

        //查找该容器的工作档
        //查找该货架的工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast)){
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -712,7 +712,7 @@
            agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
            agvBasDevpDto.setAgvWrkMast(agvWrkMast);
        }
        //查找该容器的入库通知档
        //查找该货架的入库通知档
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
        if(!Cools.isEmpty(agvWaitPakinList)){
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);