#
luxiaotao1123
2024-10-30 f4afec78b16219f00bd9aee594e1676e3adb14e0
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -78,11 +78,19 @@
                // if the type of this funSta is charge and the existing agv is in charge status, then that means this funSta is occupied
                if (null != existAgv) {
                    AgvDetail agvDetail = agvDetailService.selectByAgvId(existAgv.getId());
                    AgvModel agvModel = agvModelService.getById(existAgv.getAgvModel());
                    if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                        AgvModel agvModel = agvModelService.getById(existAgv.getAgvModel());
                        if (agvDetail.getVol() < agvModel.getQuaBattery()) {
                            return false;
                        }
                    } else {
                        Task latestTask = taskService.findLatestTask(existAgv.getId(), null);
                        if (null != latestTask
                                && latestTask.getTaskType().equals(TaskTypeType.TO_CHARGE.val())
                                && latestTask.getDestCode().equals(funcSta.getCode())
                        ) {
                            return false;
                        }
                    }
                }