#path similarity

Junjie

2024-12-11 8ef2bb5e46d84594e6ed632c07ea0b47a1bf6c4d

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

@@ -17,6 +17,8 @@
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.StaProtocol;
import com.zy.asrs.wcs.rcs.thread.DevpThread;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +84,7 @@
        LiftAssignCommand assignCommand = new LiftAssignCommand();
        assignCommand.setLiftNo(liftProtocol.getLiftNo());
        assignCommand.setTaskNo(motion.getTaskNo());
        assignCommand.setDeviceTaskNo(liftThread.generateDeviceTaskNo(motion.getTaskNo(), MotionCtgType.get(motion.getMotionCtgEl())));
        assignCommand.setCommands(list);

        List<LiftCommand> command = new ArrayList<>();
@@ -98,7 +101,7 @@
                    break;
                }

                command = liftThread.getMoveCommand(motion.getTaskNo(), 0, Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE);
                command = liftThread.getMoveCommand(assignCommand.getDeviceTaskNo(), 0, Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE);
                list.addAll(command);
                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_WITH_GOODS:
@@ -110,8 +113,57 @@
//                    return false;
//                }

                command = liftThread.getPalletInOutCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
                //判断目标站是否有托盘
                Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, conveyorDeviceId);
                if (devpThread == null) {
                    return false;
                }
//                //*************标准系统代码********************
//                StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
//                if (staProtocol == null) {
//                    return false;
//                }
//                if (!staProtocol.isAutoing()) {
//                    return false;
//                }
//                if (staProtocol.isLoading()) {
//                    return false;
//                }
//                if (staProtocol.getWorkNo().intValue() != 0) {
//                    return false;
//                }
//                //*************************************************


                //*************此代码为光泰定制代码********************
                Integer tarDrt = motion.getTarDrt();
                if (tarDrt == 31001) {
                    tarDrt = 31004;
                }

                StaProtocol staProtocol = devpThread.getStation().get(tarDrt);
                if (staProtocol == null) {
                    return false;
                }
                if (!staProtocol.isAutoing()) {
                    return false;
                }
                if (staProtocol.isLoading()) {
                    return false;
                }
                if (staProtocol.getWorkNo().intValue() != 0) {
                    return false;
                }
                //*************************************************

                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:
                //判断提升机是否自动
@@ -123,7 +175,7 @@
                    return false;
                }

                command = liftThread.getMoveWithShuttleCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE_CAR);
                command = liftThread.getMoveWithShuttleCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE_CAR);
                list.addAll(command);
                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_WITH_GOODS_AND_SHUTTLE:
@@ -142,7 +194,7 @@
                    return false;
                }

                command = liftThread.getLockCommand(motion.getTaskNo(), true);//获取提升机锁定命令
                command = liftThread.getLockCommand(assignCommand.getDeviceTaskNo(), true);//获取提升机锁定命令
                list.addAll(command);
                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_UNLOCK:
@@ -152,7 +204,7 @@
                    return false;
                }

                command = liftThread.getLockCommand(motion.getTaskNo(), false);//获取提升机解定命令
                command = liftThread.getLockCommand(assignCommand.getDeviceTaskNo(), false);//获取提升机解定命令
                list.addAll(command);
                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            case LIFT_SHUTTLE_ARRIVAL:
@@ -162,7 +214,7 @@
                    return false;
                }

                command = liftThread.getShuttleSignalCommand(motion.getTaskNo(), true);//获取小车已到位命令
                command = liftThread.getShuttleSignalCommand(assignCommand.getDeviceTaskNo(), true);//获取小车已到位命令
                list.addAll(command);
                return liftAction.assignWork(liftThread.getDevice(), assignCommand);
            default:
@@ -227,6 +279,66 @@
                    return false;
                }

                //判断目标站是否有托盘
                Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, conveyorDeviceId);
                if (devpThread == null) {
                    return false;
                }

//                //*************此代码为标准版本代码********************
//                StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
//                if(staProtocol == null) {
//                    return false;
//                }
//                if (!staProtocol.isAutoing()) {
//                    return false;
//                }
//                if (!staProtocol.isLoading()) {
//                    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;
//                    }
//                }
//                //*************************************************

                //*************此代码为光泰定制代码********************
                ArrayList<Integer> staList = new ArrayList<>();
                staList.add(motion.getTarDrt());
                staList.add(31003);
                staList.add(31002);
                staList.add(31001);

                boolean check = false;
                for (Integer sta : staList) {
                    StaProtocol staProtocol = devpThread.getStation().get(sta);
                    if (staProtocol == null) {
                        continue;
                    }
                    if (!staProtocol.isAutoing()) {
                        continue;
                    }
                    if (!staProtocol.isLoading()) {
                        continue;
                    }
                    if (Integer.parseInt(motion.getTemp()) == staProtocol.getWorkNo().intValue()) {
                        check = true;
                        break;
                    }
                }

                if (!check) {
                    return false;
                }
                //*************************************************


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