#

luxiaotao1123

2022-09-15 e0276af68793e2e7d999f8cf31727ae0657fc84e

#

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

@@ -451,18 +451,20 @@
                log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
                flag = true;
            }
            if (!flag) {
                continue;
            }
            // 获取工作状态为 2,3,4,5,6 的入库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep23456(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
            if(null == wrkMast) {
                log.error("{}站点查询无待入库数据 工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
                continue;
            }
            if (wrkMast.getWrkSts() < 3) {
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                        && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
                    flag = true;
                }
                if (!flag) {
                    continue;
                }
            }
            // 获取库位信息
            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -857,7 +859,7 @@
                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                    crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转
                    crnCommand.setSourcePosX(steProtocol.getRow());     // 源库位排
                    crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列
                    crnCommand.setSourcePosZ(steProtocol.getLev());     // 源库位层
@@ -886,7 +888,7 @@
                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                    crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转
                    crnCommand.setSourcePosX(steProtocol.getRow());     // 源库位排
                    crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列
                    crnCommand.setSourcePosZ(steProtocol.getLev());     // 源库位层
@@ -1044,6 +1046,18 @@
                        if (!steThread.confirmPos()) {
                            log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
                        }
                        // 穿梭车去待机位
                        BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
                        SteCommand steCommand = new SteCommand();
                        steCommand.setSteNo(wrkMast.getSteNo()); // 穿梭车编号
                        steCommand.setTaskNo(9999); // 工作号
                        steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 任务模式:  去近点 等待堆垛机叉取
//                        steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
//                        steCommand.setBay(steProtocol.getBay());
//                        steCommand.setLev(steProtocol.getLev());
                        if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
                            log.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
                        }
                    } else {
                        log.error("修改工作档状态 4.迁入小车 => 6.小车待入 失败！！，工作号={}", wrkMast.getWrkNo());
                    }
@@ -1116,54 +1130,56 @@
            SteProtocol steProtocol = steThread.getSteProtocol();
            if (steProtocol == null) { continue; }
            if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0) {
                // 查询是否有待入库的任务
                WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo().intValue());
                if (wrkMast == null) { continue; }
                if (steProtocol.getTaskNo() == 9999) {
                    steThread.setResetFlag(true);
                } else {
                    // 查询是否有待入库的任务
                    WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo().intValue());
                    if (wrkMast == null) { continue; }

                switch (wrkMast.getWrkSts().intValue()) {
                    case 2:
                        // 修改工作档状态 2.设备上走 => 3.小车待搬
                        wrkMast.setWrkSts(3L);
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 2.设备上走 => 3.小车待搬 失败！！，工作号={}", wrkMast.getWrkNo());
                        } else {
                            steThread.setResetFlag(true);
                        }
                        break;
                    case 8:
                        // 修改工作档状态 8.小车搬入库 => 9.入库完成
                        wrkMast.setWrkSts(9L);
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 8.小车搬入库 => 9.入库完成 失败！！，工作号={}", wrkMast.getWrkNo());
                        } else {
                            steThread.setResetFlag(true);
                        }
                        break;
                    case 11:
                        // 修改工作档状态 11.生成出库ID => 12.小车待搬
                        wrkMast.setWrkSts(12L);
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 11.生成出库ID => 12.小车待搬 失败！！，工作号={}", wrkMast.getWrkNo());
                        } else {
                            steThread.setResetFlag(true);
                        }
                        break;
                    case 14:
                        // 修改工作档状态 14.小车搬出库 => 15.等待吊车
                        wrkMast.setWrkSts(15L);
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 14.小车搬出库 => 15.等待吊车 失败！！，工作号={}", wrkMast.getWrkNo());
                        } else {
                            steThread.setResetFlag(true);
                        }
                        break;
                    switch (wrkMast.getWrkSts().intValue()) {
                        case 2:
                            // 修改工作档状态 2.设备上走 => 3.小车待搬
                            wrkMast.setWrkSts(3L);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                log.error("修改工作档状态 2.设备上走 => 3.小车待搬 失败！！，工作号={}", wrkMast.getWrkNo());
                            } else {
                                steThread.setResetFlag(true);
                            }
                            break;
                        case 8:
                            // 修改工作档状态 8.小车搬入库 => 9.入库完成
                            wrkMast.setWrkSts(9L);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                log.error("修改工作档状态 8.小车搬入库 => 9.入库完成 失败！！，工作号={}", wrkMast.getWrkNo());
                            } else {
                                steThread.setResetFlag(true);
                            }
                            break;
                        case 11:
                            // 修改工作档状态 11.生成出库ID => 12.小车待搬
                            wrkMast.setWrkSts(12L);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                log.error("修改工作档状态 11.生成出库ID => 12.小车待搬 失败！！，工作号={}", wrkMast.getWrkNo());
                            } else {
                                steThread.setResetFlag(true);
                            }
                            break;
                        case 14:
                            // 修改工作档状态 14.小车搬出库 => 15.等待吊车
                            wrkMast.setWrkSts(15L);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                log.error("修改工作档状态 14.小车搬出库 => 15.等待吊车 失败！！，工作号={}", wrkMast.getWrkNo());
                            } else {
                                steThread.setResetFlag(true);
                            }
                            break;
                    }
                }


            }
        }
    }

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

@@ -15,8 +15,8 @@
//    MOVE_RIGHT(6, "右移库"),    // 右移库
    GO_ORIGIN(7, "去右端"),    // 回原点
    BACK_ORIGIN(8, "去左端"),      // 回反原点
//    TO_A(9, "A点"),        // A点
//    TO_B(10, "B点"),       // B点
    WAITING_RIGHT(9, "右待机"),        // A点
    WAITING_LEFT(10, "左待机"),       // B点
//    FIT_LEFT(11, "左搬移"),   // 左搬移
//    FIT_RIGHT(12, "右搬移"),      // 右搬移
    CHARGE(13, "充电"),         // 充电
@@ -53,21 +53,6 @@
            }
        }
        return null;
    }

    public static SteTaskModeType findOriginByLoc(String locNo) {
        switch (Utils.getGroupRow(locNo)) {
            case 3:
            case 11:
            case 18:
                return SteTaskModeType.GO_ORIGIN;   // 右
            case 4:
            case 12:
            case 19:
                return SteTaskModeType.BACK_ORIGIN; // 左
            default:
                throw new CoolException("解析穿梭车原点定位失败");
        }
    }

    public static SteTaskModeType findInByLoc(String locNo) {
@@ -193,4 +178,34 @@
        }
    }

    public static SteTaskModeType findWaiting(Integer row) {
        switch (row) {
            case 1:
            case 2:
            case 3:
            case 8:
            case 9:
            case 10:
            case 11:
            case 15:
            case 16:
            case 17:
            case 18:
                return SteTaskModeType.WAITING_LEFT;
            case 4:
            case 5:
            case 6:
            case 7:
            case 12:
            case 13:
            case 14:
            case 19:
            case 20:
            case 21:
                return SteTaskModeType.WAITING_RIGHT;
            default:
                throw new CoolException("解析穿梭车原点定位失败");
        }
    }

}

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -269,7 +269,7 @@

        if (result != null && result.IsSuccess) {
            Thread.sleep(200);
            this.readStatus();
//            this.readStatus();
            log.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;

 src/main/webapp/views/ste.html

@@ -115,8 +115,8 @@
<!--                            <button class="item" onclick="steOperator(6)">右移库</button>-->
                            <button class="item" onclick="steOperator(8)">去左端</button>
                            <button class="item" onclick="steOperator(7)">去右端</button>
<!--                            <button class="item" onclick="steOperator(9)">A 点</button>-->
<!--                            <button class="item" onclick="steOperator(10)">B 点</button>-->
                            <button class="item" onclick="steOperator(10)">左待机</button>
                            <button class="item" onclick="steOperator(9)">右待机</button>
<!--                            <button class="item" onclick="steOperator(11)">左搬移</button>-->
<!--                            <button class="item" onclick="steOperator(12)">右搬移</button>-->
                            <button class="item" onclick="steOperator(13)">充电</button>