#

Junjie

2024-10-17 236d970338b4a5cb1bd33b5cc042fac89b61df66

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

@@ -115,6 +115,11 @@

                command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
                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:
                //判断提升机是否自动
@@ -247,9 +252,15 @@
                    return false;
                }
                if (!motion.getTaskNo().equals(staProtocol.getWorkNo().intValue())) {
                    if (motion.getTemp() == null) {
                    return false;
                }

                    if (Integer.parseInt(motion.getTemp()) != staProtocol.getWorkNo().intValue()) {
                        return false;
                    }
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());