# 地图优化

whycq

2024-06-04 2dd641969aa20b81156bd421acb777e8c3fc9725

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

@@ -559,17 +559,6 @@
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
//        if(!wrkMast.getLocNo().contains("@") || !wrkMast.getSourceLocNo().contains("@")){
//            throw new CoolException("目标库位或者源库位暂未分配，无法取消");
//        }
        //修改AGV工作档的工作状态为205.工作完成
        //agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);

        //if (wrkMast.getIoType() == 101) {
        //    agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"手动完成",userId);
        //} else {
        //    agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
        //}

        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
@@ -584,8 +573,12 @@
            }
            return;

        } else {
            agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
        } else  {
            if(wrkMast.getIoType() == 110){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"手动完成",userId);
            } else {
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
            }
        }

        //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
@@ -598,9 +591,7 @@
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O","",wrkMast.getWhsType().shortValue());
        }
        //出库任务 110.空板出库
        if(wrkMast.getIoType() == 110){
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
        }

        if (wrkMast.getIoType() == 10) {
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
        }