Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-09 faecccbe46a1f85b5d9b18fce12e02764faba78e

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

@@ -86,9 +86,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");
@@ -110,6 +111,10 @@
                        log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                        throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
                    }
                    } else {
                        throw new CoolException("没有空闲小车");
                    }

                }

            } else {
@@ -196,9 +201,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");
@@ -220,6 +226,10 @@
                    log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                    throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
                }
                } else {
                    throw new CoolException("没有空闲小车");
                }

            }

        }
@@ -301,9 +311,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");
@@ -325,6 +336,10 @@
                log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
                throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
            }
            } else {
                throw new CoolException("没有空闲小车");
            }

        }