Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-06-22 b678a2c6b0b43feaad90c558b2c2c3bd608deedb

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java

@@ -84,6 +84,10 @@
            }
            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
            motion.setTarDrt(target.getStaNo());//目标站

            if (target.getSync() != null) {
                motion.setSync(target.getSync());
            }
        }));

        return motionList;
@@ -182,6 +186,36 @@
        return motionList;
    }

    /**
     * 提升机-小车已到位
     */
    public List<Motion> liftShuttleArrival(MotionDto origin, MotionDto target) {
        List<Motion> motionList = new ArrayList<>();

        motionList.add(Motion.build(motion -> {
            motion.setDeviceCtg(DeviceCtgType.LIFT.val());
            motion.setDevice(String.valueOf(target.getLiftNo()));
            motion.setMotionCtg(MotionCtgType.LIFT_SHUTTLE_ARRIVAL.val());
        }));

        return motionList;
    }

    /**
     * 提升机-小车已驶离
     */
    public List<Motion> liftShuttleLeave(MotionDto origin, MotionDto target) {
        List<Motion> motionList = new ArrayList<>();

        motionList.add(Motion.build(motion -> {
            motion.setDeviceCtg(DeviceCtgType.LIFT.val());
            motion.setDevice(String.valueOf(target.getLiftNo()));
            motion.setMotionCtg(MotionCtgType.LIFT_SHUTTLE_LEAVE.val());
        }));

        return motionList;
    }

    // shuttle -----------------------------------------------------------------------------

    /**
@@ -278,6 +312,34 @@
        return motionList;
    }

    /**
     * 穿梭车动作
     */
    public List<Motion> shuttleAction(MotionDto origin, MotionDto target, MotionCtgType motionCtgType) {
        List<Motion> motionList = new ArrayList<>();

        motionList.add(Motion.build(motion -> {
            motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
            motion.setDevice(String.valueOf(target.getShuttleNo()));

            motion.setMotionCtg(motionCtgType.val());

            switch (motionCtgType) {
                case SHUTTLE_PALLET_LIFT://托盘顶升

                    break;
                case SHUTTLE_PALLET_DOWN://托盘下降

                    break;
                default:
                    break;
            }

        }));

        return motionList;
    }

    public List<Motion> shuttleCharge(MotionDto origin, MotionDto target) {
        List<Motion> motionList = new ArrayList<>();