#

Junjie

2024-10-17 d62c5c0eb2e28b7bf27d23de84a609b5a2e415e4

 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:
                //判断提升机是否自动
@@ -236,13 +241,59 @@
                if (devpThread == null) {
                    return false;
                }
                StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
                if(staProtocol == null) {

//                //*************此代码为标准版本代码********************
//                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 (!staProtocol.isLoading()) {
                    return false;
                }
                //*************************************************


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