#

luxiaotao1123

2022-09-22 52808045686126c1c1fd0488c93768339155111a

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1662,23 +1662,6 @@
                                } else {
                                    steThread.setResetFlag(true);
                                }
                            } else if (wrkCharge.getWrkSts() == 26) {
                                if (steProtocol.getChargeStatus() == 0) { continue; }
                                // 穿梭车充电命令下发区 --------------------------------------------------------------------------
                                SteCommand steCommand = new SteCommand();
                                steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
                                steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
                                steCommand.setTaskMode(SteTaskModeType.CHARGE);
                                if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
                                    log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
                                } else {
                                    // 修改工作档状态  26.等待充电 ===> 27.输送线上电
                                    wrkCharge.setWrkSts(27L);
                                    wrkCharge.setModiTime(now);
                                    if (!wrkChargeService.updateById(wrkCharge)) {
                                        log.error("修改充电任务状态 26.等待充电 ===> 27.输送线上电 失败！！，工作号={}", wrkCharge.getWrkNo());
                                    }
                                }
                            } else if (wrkCharge.getWrkSts() == 27) {
                                // 给输送线下发充电任务
                                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -2091,8 +2074,11 @@
            BasSte basSte = basSteService.selectById(ste.getId());
            if (Cools.isEmpty(steProtocol, basSte)) { continue; }
            try {
                // 空闲   无作业标记   不在充电
                if (!steProtocol.statusType.equals(SteStatusType.IDLE) || basSte.getPakMk().equals("Y") || steProtocol.getChargeStatus() == 1) {
                // 在线 空闲   无作业标记   不在充电
                if (steProtocol.getMode() == 0
                        || !steProtocol.statusType.equals(SteStatusType.IDLE)
                        || basSte.getPakMk().equals("Y")
                        || steProtocol.getChargeStatus() == 1) {
                    continue;
                }
                if (!steProtocol.isEnable()) {
@@ -2183,6 +2169,23 @@
                                }
                            }
                        }
                    } else if (wrkCharge.getWrkSts() == 26) {
                        if (steProtocol.getChargeStatus() == 1) { continue; }
                        // 穿梭车充电命令下发区 --------------------------------------------------------------------------
                        SteCommand steCommand = new SteCommand();
                        steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
                        steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
                        steCommand.setTaskMode(SteTaskModeType.CHARGE);
                        if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
                            log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
                        } else {
                            // 修改工作档状态  26.等待充电 ===> 27.输送线上电
                            wrkCharge.setWrkSts(27L);
                            wrkCharge.setModiTime(new Date());
                            if (!wrkChargeService.updateById(wrkCharge)) {
                                log.error("修改充电任务状态 26.等待充电 ===> 27.输送线上电 失败！！，工作号={}", wrkCharge.getWrkNo());
                            }
                        }
                    }
                }
            } catch (Exception e) {

 src/main/java/com/zy/core/enums/SteStatusType.java

@@ -24,7 +24,7 @@
                return type;
            }
        }
        return null;
        return OFF_LINE;
    }

    public static SteStatusType get(SteStatusType type) {