Junjie
2024-12-13 b03732972ca2bf2a8b859449e141dc05fe9cbb9f
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -101,8 +101,8 @@
            String shuttleLocNo = shuttleProtocol.getCurrentLocNo();
            //获取距离目标位置最近的空闲可换层提升机
            LiftThread liftThread = liftDispatcher.searchIdleLift(shuttleLocNo, task.getHostId(), true);
            //获取距离目标位置最近的可换层提升机(可能不空闲)
            LiftThread liftThread = liftDispatcher.searchLift(shuttleLocNo, task.getHostId(), true);
            if (liftThread == null) {
                return motionList;
            }
@@ -158,21 +158,21 @@
            // 入库目标层有穿梭车
            if (Utils.getLev(shuttleLocNo) == Utils.getLev(task.getDestLoc())) {
                // 提升机载货移动
                motionList.addAll(kernelService.liftMoveGoods(
                        MotionDto.build((dto -> {
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(1);//光泰1层是输送线层
                            dto.setStaNo(31004);//入库站点
                        }))
                        , MotionDto.build((dto -> {
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(Utils.getLev(task.getDestLoc()));
                            dto.setStaNo(getStaByLev(Utils.getLev(task.getDestLoc())));
                            dto.setDevpNo(basConveyorStaDest.getConveyorDeviceId().intValue());
                            dto.setReleaseLift(1);//执行完成后释放提升机
                        }))
                ));
//                // 提升机载货移动
//                motionList.addAll(kernelService.liftMoveGoods(
//                        MotionDto.build((dto -> {
//                            dto.setLiftNo(transferLiftDevice.getId().intValue());
//                            dto.setLev(1);//光泰1层是输送线层
//                            dto.setStaNo(31004);//入库站点
//                        }))
//                        , MotionDto.build((dto -> {
//                            dto.setLiftNo(transferLiftDevice.getId().intValue());
//                            dto.setLev(Utils.getLev(task.getDestLoc()));
//                            dto.setStaNo(getStaByLev(Utils.getLev(task.getDestLoc())));
//                            dto.setDevpNo(basConveyorStaDest.getConveyorDeviceId().intValue());
//                            dto.setReleaseLift(1);//执行完成后释放提升机
//                        }))
//                ));
                // 穿梭车走行至提升机库位待机位
                motionList.addAll(kernelService.shuttleMove(
@@ -227,21 +227,21 @@
             */
            } else {
                // 提升机载货移动
                motionList.addAll(kernelService.liftMoveGoods(
                        MotionDto.build((dto -> {
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(1);//光泰1层是输送线层
                            dto.setStaNo(31004);//入库站点
                        }))
                        , MotionDto.build((dto -> {
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(Utils.getLev(task.getDestLoc()));
                            dto.setStaNo(getStaByLev(Utils.getLev(task.getDestLoc())));
                            dto.setDevpNo(basConveyorStaDest.getConveyorDeviceId().intValue());
                            dto.setReleaseLift(1);//执行完成后释放提升机
                        }))
                ));
//                // 提升机载货移动
//                motionList.addAll(kernelService.liftMoveGoods(
//                        MotionDto.build((dto -> {
//                            dto.setLiftNo(transferLiftDevice.getId().intValue());
//                            dto.setLev(1);//光泰1层是输送线层
//                            dto.setStaNo(31004);//入库站点
//                        }))
//                        , MotionDto.build((dto -> {
//                            dto.setLiftNo(transferLiftDevice.getId().intValue());
//                            dto.setLev(Utils.getLev(task.getDestLoc()));
//                            dto.setStaNo(getStaByLev(Utils.getLev(task.getDestLoc())));
//                            dto.setDevpNo(basConveyorStaDest.getConveyorDeviceId().intValue());
//                            dto.setReleaseLift(1);//执行完成后释放提升机
//                        }))
//                ));
                // 穿梭车走行至提升机库位待机位
                motionList.addAll(kernelService.shuttleMove(