#

zjj

2025-04-08 3df03c486fde77ab36b9298a94bdbb0aa065a7e2

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

@@ -140,6 +140,40 @@
                motionService.updateById(motion);

                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_WITH_GOODS_IN:
                //判断提升机是否自动
                if (!liftThread.isIdle()) {
                    return false;
                }
                if (liftProtocol.getHasTray()) {
                    return false;
                }

                command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), task.getTaskSts() < 100 ? LiftCommandModeType.PALLET_IN : LiftCommandModeType.PALLET_OUT);
                list.addAll(command);

                motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
                motion.setUpdateTime(new Date());
                motionService.updateById(motion);

                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_WITH_GOODS_OUT:
                //判断提升机是否自动
                if (!liftThread.isIdle()) {
                    return false;
                }
                if (!liftProtocol.getHasTray()) {
                    return false;
                }

                command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), task.getTaskSts() < 100 ? LiftCommandModeType.PALLET_IN : LiftCommandModeType.PALLET_OUT);
                list.addAll(command);

                motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
                motion.setUpdateTime(new Date());
                motionService.updateById(motion);

                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_WITH_SHUTTLE:
                //判断提升机是否自动
                if (!liftThread.isIdle()) {
@@ -226,7 +260,7 @@
                    return false;
                }

                if (!liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
                if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
                    return false;
                }

@@ -250,10 +284,10 @@
                    return false;
                }

                //判断提升机托盘是否存在
                if (!liftProtocol.getHasTray()) {
                    return false;
                }
//                //判断提升机托盘是否存在
//                if (!liftProtocol.getHasTray()) {
//                    return false;
//                }

//                //判断目标站是否有托盘
//                Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
@@ -293,6 +327,54 @@
                }

                break;
            case LIFT_WITH_GOODS_IN:
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }

                if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
                    return false;
                }

                //判断提升机托盘是否存在
                if (!liftProtocol.getHasTray()) {
                    return false;
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;
                    }
                }

                break;
            case LIFT_WITH_GOODS_OUT:
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }

                if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
                    return false;
                }

                //判断提升机托盘是否存在
                if (liftProtocol.getHasTray()) {
                    return false;
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;
                    }
                }

                break;
            case LIFT_WITH_SHUTTLE:
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {