1

zhangc

2025-04-10 50435a81915932eda06b7f1afd48f9ff1ae84f19

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

@@ -85,7 +85,7 @@
    /**
     * 提升机载货移动
     */
    public List<Motion> liftMoveGoods(MotionDto origin, MotionDto target) {
    public List<Motion> liftMoveGoods(MotionDto origin, MotionDto target, MotionCtgType type) {
        List<Motion> motionList = new ArrayList<>();

        motionList.add(Motion.build(motion -> {
@@ -93,13 +93,18 @@
            motion.setDevice(String.valueOf(target.getLiftNo()));

            motion.setMotionCtg(MotionCtgType.LIFT_WITH_GOODS.val());
            if (type != null) {
                motion.setMotionCtg(type.val());
            }

            if (null != origin) {
                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
                motion.setOriDrt(origin.getStaNo());//源站
//                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
//                motion.setOriDrt(origin.getStaNo());//源站
                motion.setOrigin(String.valueOf(origin.getStaNo()));
            }
            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
            motion.setTarDrt(target.getStaNo());//目标站
//            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
//            motion.setTarDrt(target.getStaNo());//目标站
            motion.setTarget(String.valueOf(target.getStaNo()));

            if (target.getDevpNo() != null) {
                motion.setDockNo(String.valueOf(target.getDevpNo()));//输送线ID