#

luxiaotao1123

2021-06-09 9512f15494e270f93013540e6862b7ea77a03865

#

 src/main/java/com/zy/asrs/service/BasAgvService.java

@@ -7,6 +7,8 @@

    BasAgv selectIdleAgv();

    Boolean haveIdleAgv();

    String getAgvWorkNo();

    String getEmptyAgvWorkNo();

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

@@ -32,6 +32,20 @@
    }

    @Override
    public Boolean haveIdleAgv() {
        List<BasAgv> idleAgvs = this.selectList(new EntityWrapper<BasAgv>()
                .eq("in_enable", "Y")
                .eq("is_user", 1)
                .in("status", 6, 8 ,12)
        );
        if (Cools.isEmpty(idleAgvs)) {
            log.warn("没有空闲的Agv小车");
            return false;
        }
        return true;
    }

    @Override
    public String getAgvWorkNo() {
        String workNo = null;
        for (int i = 0; i < 10; i++) {

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

@@ -82,9 +82,10 @@
                }
                // 小车入库搬运命令 ----------------------------------------------------
                if (!Cools.isEmpty(param.getAgvSite())) {
                    BasAgv idleAgv = basAgvService.selectIdleAgv();
                    // 判断是否有空闲小车
                    if (basAgvService.haveIdleAgv()) {
                    AgvCommand command = new AgvCommand();
                    command.setAgvId(idleAgv.getAgvId());
                        command.setAgvId(0);
                    command.setInterCode(basAgvService.getAgvWorkNo());
                    command.setBeginLoc(String.valueOf(param.getAgvSite()));
                    command.setEndLoc("1088");
@@ -106,6 +107,10 @@
                        log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                        throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
                    }
                    } else {
                        throw new CoolException("没有空闲小车");
                    }

                }

            } else {
@@ -192,9 +197,10 @@

            // 小车入库搬运命令 ----------------------------------------------------
            if (!Cools.isEmpty(param.getCombMats()) && !Cools.isEmpty(param.getAgvSite())) {
                BasAgv idleAgv = basAgvService.selectIdleAgv();
                // 判断是否有空闲小车
                if (basAgvService.haveIdleAgv()) {
                AgvCommand command = new AgvCommand();
                command.setAgvId(idleAgv.getAgvId());
                    command.setAgvId(0);
                command.setInterCode(basAgvService.getAgvWorkNo());
                command.setBeginLoc(String.valueOf(param.getAgvSite()));
                command.setEndLoc("1088");
@@ -216,6 +222,10 @@
                    log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                    throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
                }
                } else {
                    throw new CoolException("没有空闲小车");
                }

            }

        }
@@ -297,9 +307,10 @@
        }
        // 小车入库搬运命令 ----------------------------------------------------
        if (!Cools.isEmpty(param.getCombMats()) && !Cools.isEmpty(param.getAgvSite())) {
            BasAgv idleAgv = basAgvService.selectIdleAgv();
            // 判断是否有空闲小车
            if (basAgvService.haveIdleAgv()) {
            AgvCommand command = new AgvCommand();
            command.setAgvId(idleAgv.getAgvId());
                command.setAgvId(0);
            command.setInterCode(basAgvService.getAgvWorkNo());
            command.setBeginLoc(String.valueOf(param.getAgvSite()));
            command.setEndLoc("1088");
@@ -321,6 +332,10 @@
                log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
            }
            } else {
                throw new CoolException("没有空闲小车");
            }

        }



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

@@ -327,9 +327,10 @@
        BasDevp staNo = basDevpService.checkSiteStatus(devpNo);
        if (!Cools.isEmpty(staNo.getFronting()) && staNo.getFronting().equals("Y")) {
            // 小车入库搬运命令 ----------------------------------------------------
            BasAgv idleAgv = basAgvService.selectIdleAgv();
            // 判断是否有空闲小车
            if (basAgvService.haveIdleAgv()) {
            AgvCommand command = new AgvCommand();
            command.setAgvId(idleAgv.getAgvId());
                command.setAgvId(0);
            command.setInterCode(basAgvService.getEmptyAgvWorkNo());
            command.setBeginLoc(String.valueOf(devpNo));
            command.setEndLoc("1088");
@@ -351,6 +352,10 @@
                log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
            }
            } else {
                throw new CoolException("没有空闲小车");
            }

            return "待定";
        } else {
            // 源站点状态检测