#

Junjie

2025-07-06 0d04bc5d8080b82338302fba0a59fccff2eaedfc

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -545,6 +545,11 @@
        }

        for (Task task : tasks) {
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskSts, TaskStsType.ANALYZE_OUTBOUND.sts, TaskStsType.EXECUTE_OUTBOUND.sts));
            if (!list.isEmpty()) {
                continue;//存在正在解析，正在执行任务
            }

            BasConveyorSta originStaObj = basConveyorStaService.selectBySiteNo(task.getOriginSite());//获取源站
            if (originStaObj == null) {
                continue;
@@ -722,6 +727,20 @@
                continue;
            }

            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
                    .in(Task::getTaskSts
                            , TaskStsType.NEW_INBOUND.sts
                            , TaskStsType.ANALYZE_INBOUND.sts
                            , TaskStsType.EXECUTE_INBOUND.sts
                            , TaskStsType.NEW_OUTBOUND.sts
                            , TaskStsType.ANALYZE_OUTBOUND.sts
                            , TaskStsType.EXECUTE_OUTBOUND.sts)
            );
            if (!taskList.isEmpty()) {
                News.info("{}号小车，系统存在正在执行任务，暂停充电任务", shuttleProtocol.getShuttleNo());
                continue;//正在执行任务，不执行充电
            }

            String currentLocNo = shuttleProtocol.getCurrentLocNo();
            int lev = Utils.getLev(currentLocNo);//获取小车楼层
            //搜索小车当前楼层充电桩