#path similarity

Junjie

2024-12-11 8ef2bb5e46d84594e6ed632c07ea0b47a1bf6c4d

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

@@ -113,6 +113,50 @@
//                    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 (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);

@@ -241,26 +285,60 @@
                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;
//                //*************此代码为标准版本代码********************
//                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());