优化自动移库逻辑及调拨信息上报

zhangc

2025-01-01 6cfcb307f01b9550b6cd67321f2c1db345b4da19

优化自动移库逻辑及调拨信息上报

 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java

@@ -44,21 +44,21 @@

    // 调拨出库
//    @Scheduled(cron = "0/2 * * * * ? ")
    private void execute(){
        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
                new EntityWrapper<AgvLocMast>()
                        .isNotNull("loc_type")
                        .ne("loc_type", "")
                        .eq("floor", 1)
                        .eq("loc_sts","F"));
        if (agvLocMasts.isEmpty()) {
            return;
        }
        for (AgvLocMast agvLocMast : agvLocMasts) {
            ReturnT<String> returnT = autoMoveHandler.start(agvLocMast);
        }

    }
//    private void execute(){
//        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
//                new EntityWrapper<AgvLocMast>()
//                        .isNotNull("loc_type")
//                        .ne("loc_type", "")
//                        .eq("floor", 1)
//                        .eq("loc_sts","F"));
//        if (agvLocMasts.isEmpty()) {
//            return;
//        }
//        for (AgvLocMast agvLocMast : agvLocMasts) {
//            ReturnT<String> returnT = autoMoveHandler.start(agvLocMast);
//        }
//
//    }

    /**
     * 自动调拨任务，从1楼调拨到2楼，3楼

 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java

@@ -35,15 +35,15 @@
    @Autowired
    AgvBasDevpService agvBasDevpService;

    public ReturnT<String> start(AgvLocMast agvLocMast) {
        // locType 1. 自动， 2. 手动
        if (agvLocMast.getLocType().equals("1")) {
            return doAutoMove(agvLocMast);
        } else if (agvLocMast.getLocType().equals("2")) {
            return doHandMove(agvLocMast);
        }
        return SUCCESS;
    }
//    public ReturnT<String> start(AgvLocMast agvLocMast) {
//        // locType 1. 自动， 2. 手动
//        if (agvLocMast.getLocType().equals("1")) {
//            return doAutoMove(agvLocMast);
//        } else if (agvLocMast.getLocType().equals("2")) {
//            return doHandMove(agvLocMast);
//        }
//        return SUCCESS;
//    }

    public ReturnT<String> start2(AgvWrkMast agvWrkMast) {
        // locType 1. 自动， 2. 手动
@@ -62,66 +62,66 @@
        return SUCCESS;
    }
    //根据库位的loctype值发送任务--弃用
    private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
        Date now = new Date();
        //查询工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
        if(!Cools.isEmpty(agvWrkMast)){
            throw new CoolException("当前"+agvLocMast.getBarcode()+"货架码已在工作档中");
        }
        //检索库位，选择合适的库位
        AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
        //生成工作档
        AgvWrkMast mast = new AgvWrkMast();
        //工作状态
        mast.setWrkSts(201L);
        //入出库类型
        mast.setIoType(108);
        mast.setIoTime(now);
        //优先级
        mast.setIoPri(300.0);
        //源站点
        mast.setSourceLocNo(agvLocMast.getLocNo());
        //目标站点
        mast.setLocNo(LocMast.getLocNo());
        //货架编码
        mast.setBarcode(agvLocMast.getBarcode());
        //货架类型
        mast.setWhsType(30);

        mast.setAppeUser(9527L);
        mast.setAppeTime(now);
        mast.setModiUser(9527L);
        mast.setModiTime(now);
        mast.setLogErrMemo("doAutoMove");
        if (!agvWrkMastService.insertByIncrease(mast)) {
            throw new CoolException("保存工作档失败");
        }

        AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
        //生成工作档明细
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
        agvLocDetls.forEach(agvLocDetl -> {
            AgvWrkDetl wrkDetl = new AgvWrkDetl();
            wrkDetl.setWrkNo(mast1.getWrkNo());
            wrkDetl.sync(agvLocDetl);
            wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeUser(9527L);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiUser(9527L);
            wrkDetl.setModiTime(now);
            if (!agvWrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        });
        //更新目标库位状态
        updateAgvLocMast(agvLocMast,"R");
        updateAgvLocMast(LocMast,"S");

        return SUCCESS;
    }
//    private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
//        Date now = new Date();
//        //查询工作档
//        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
//        if(!Cools.isEmpty(agvWrkMast)){
//            throw new CoolException("当前"+agvLocMast.getBarcode()+"货架码已在工作档中");
//        }
//        //检索库位，选择合适的库位
//        AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
//        //生成工作档
//        AgvWrkMast mast = new AgvWrkMast();
//        //工作状态
//        mast.setWrkSts(201L);
//        //入出库类型
//        mast.setIoType(108);
//        mast.setIoTime(now);
//        //优先级
//        mast.setIoPri(300.0);
//        //源站点
//        mast.setSourceLocNo(agvLocMast.getLocNo());
//        //目标站点
//        mast.setLocNo(LocMast.getLocNo());
//        //货架编码
//        mast.setBarcode(agvLocMast.getBarcode());
//        //货架类型
//        mast.setWhsType(30);
//
//        mast.setAppeUser(9527L);
//        mast.setAppeTime(now);
//        mast.setModiUser(9527L);
//        mast.setModiTime(now);
//        mast.setLogErrMemo("doAutoMove");
//        if (!agvWrkMastService.insertByIncrease(mast)) {
//            throw new CoolException("保存工作档失败");
//        }
//
//        AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
//        //生成工作档明细
//        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
//        agvLocDetls.forEach(agvLocDetl -> {
//            AgvWrkDetl wrkDetl = new AgvWrkDetl();
//            wrkDetl.setWrkNo(mast1.getWrkNo());
//            wrkDetl.sync(agvLocDetl);
//            wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
//            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
//            wrkDetl.setIoTime(now);
//            wrkDetl.setAppeUser(9527L);
//            wrkDetl.setAppeTime(now);
//            wrkDetl.setModiUser(9527L);
//            wrkDetl.setModiTime(now);
//            if (!agvWrkDetlService.insert(wrkDetl)) {
//                throw new CoolException("保存工作明细失败");
//            }
//        });
//        //更新目标库位状态
//        updateAgvLocMast(agvLocMast,"R");
//        updateAgvLocMast(LocMast,"S");
//
//        return SUCCESS;
//    }

    private ReturnT<String> doHandMove(AgvLocMast agvLocMast) {
        Date now = new Date();
@@ -189,7 +189,7 @@
    private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
        Date now = new Date();
        //检索库位，选择合适的库位
        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true);
        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true,null);
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("暂无库位");
        }
@@ -213,7 +213,7 @@
    private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
        Date now = new Date();
        //检索库位，选择合适的库位
        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false);
        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false,null);
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("暂无库位");
        }
@@ -320,7 +320,7 @@
        Date now = new Date();
        AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
        //检索空闲接驳位，选择合适的接驳位
        AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true);
        AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true,null);
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("1楼暂无空库位");
        }
@@ -339,47 +339,47 @@
        return SUCCESS;
    }

    public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
        Date now = new Date();
        //查询工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
        if(!Cools.isEmpty(agvWrkMast)){
            throw new CoolException("当前"+agvLocMast.getBarcode()+"货架码已在工作档中");
        }
        //检索库位，选择合适的库位
        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
        //生成工作档
        AgvWrkMast mast = new AgvWrkMast();
        //工作状态
        mast.setWrkSts(201L);
        //入出库类型
        mast.setIoType(109);
        mast.setIoTime(now);
        //优先级
        mast.setIoPri(300.0);
        //源站点
        mast.setSourceLocNo(agvLocMast.getLocNo());
        //目标站点
        mast.setLocNo(LocMast.getLocNo());
        //货架编码
        mast.setBarcode(agvLocMast.getBarcode());
        //货架类型
        mast.setWhsType(30);

        mast.setAppeUser(9527L);
        mast.setAppeTime(now);
        mast.setModiUser(9527L);
        mast.setModiTime(now);
        mast.setLogErrMemo("autoEmptyBack2");
        if (!agvWrkMastService.insertByIncrease(mast)) {
            throw new CoolException("保存工作档失败");
        }

        //更新目标库位状态
        updateAgvLocMast(agvLocMast,"R");
        updateAgvLocMast(LocMast,"S");
        return SUCCESS;
    }
//    public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
//        Date now = new Date();
//        //查询工作档
//        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
//        if(!Cools.isEmpty(agvWrkMast)){
//            throw new CoolException("当前"+agvLocMast.getBarcode()+"货架码已在工作档中");
//        }
//        //检索库位，选择合适的库位
//        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
//        //生成工作档
//        AgvWrkMast mast = new AgvWrkMast();
//        //工作状态
//        mast.setWrkSts(201L);
//        //入出库类型
//        mast.setIoType(109);
//        mast.setIoTime(now);
//        //优先级
//        mast.setIoPri(300.0);
//        //源站点
//        mast.setSourceLocNo(agvLocMast.getLocNo());
//        //目标站点
//        mast.setLocNo(LocMast.getLocNo());
//        //货架编码
//        mast.setBarcode(agvLocMast.getBarcode());
//        //货架类型
//        mast.setWhsType(30);
//
//        mast.setAppeUser(9527L);
//        mast.setAppeTime(now);
//        mast.setModiUser(9527L);
//        mast.setModiTime(now);
//        mast.setLogErrMemo("autoEmptyBack2");
//        if (!agvWrkMastService.insertByIncrease(mast)) {
//            throw new CoolException("保存工作档失败");
//        }
//
//        //更新目标库位状态
//        updateAgvLocMast(agvLocMast,"R");
//        updateAgvLocMast(LocMast,"S");
//        return SUCCESS;
//    }

    public ReturnT<String> autoEmptyBack4(AgvLocMast agvLocMast) {
        Date now = new Date();
@@ -410,7 +410,7 @@
            ioType = 109;
        } else {
            //检索库位，选择合适的库位
            locMast = agvCommonService.getLocNo(3,1,true,true);
            locMast = agvCommonService.getLocNo(3,1,true,true,null);
            locNo = locMast.getLocNo();
            wrkSts = 201L;
            ioType = 109;
@@ -485,7 +485,7 @@
            //入出库类型
            mast.setIoType(109);
            //检索库位，选择合适的库位
            AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true);
            AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true,null);
            mast.setLocNo(locMast.getLocNo());
            updateAgvLocMast(locMast,"S");
        } else {
@@ -559,7 +559,7 @@
            throw new CoolException("当前"+agvLocMast.getBarcode()+"货架码已在工作档中");
        }
        //检索库位，选择合适的库位
        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false);
        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false,null);
        if (LocMast.getLev1() != 2) {
            throw new CoolException("目标楼层不是吸塑二楼");
        }

 src/main/java/com/zy/common/service/AgvCommonService.java

@@ -120,7 +120,7 @@
            // 开始查找库位 ==============================>>
            // 四期项目：需要改查找库位逻辑
            // 箱壳入库
            if (type == 3) {
            if (type == 3 && factory != null) {
                //优先入库吸塑1楼，在2楼
                locMast = locUtils.getLocNoRuleByFactory(type,isEmpty ,factory);
            } else if (type == 6) {