1

zhang

1 天以前 afc12f9bbd372b55a4539c1fc40b17dbd5949cb1

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

@@ -250,7 +250,7 @@
            assignCommand.setAuto(true);//自动模式

            List<ShuttleCommand> commands = new ArrayList<>();
            Integer mapType = NavigationMapType.NORMAL.id;
            Integer mapType = NavigationMapType.DFX.id;


            //获取小车到提升机待机位行走命令
@@ -303,13 +303,13 @@
            //获取四向穿梭车线程
            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
            if (shuttleThread == null) {
                 News.taskInfo(wrkMast.getWrkNo(),"{}任务，{}号小车，小车线程不存在，禁止派发", wrkMast.getWrkNo(), wrkMast.getLiftNo());
                 News.taskInfo(wrkMast.getWrkNo(),"{}任务，{}号小车，小车线程不存在，禁止派发", wrkMast.getWrkNo(), wrkMast.getShuttleNo());
                return false;
            }

            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
            if (shuttleProtocol == null) {
                 News.taskInfo(wrkMast.getWrkNo(),"{}任务，{}号小车，小车对象不存在，禁止派发", wrkMast.getWrkNo(), wrkMast.getLiftNo());
                 News.taskInfo(wrkMast.getWrkNo(),"{}任务，{}号小车，小车对象不存在，禁止派发", wrkMast.getWrkNo(), wrkMast.getShuttleNo());
                return false;
            }

@@ -383,6 +383,7 @@
                //提升机在小车楼层
                wrkMast.setWrkSts(WrkStsType.MOVE_IN_NO_LIFT_6.sts);//小车移动到提升机中  小车移动至站点完成 ==> 提升机至小车层完成
                wrkMast.setModiTime(now);
                wrkMast.setLiftNo(1);
                wrkMastService.updateById(wrkMast);
                return false;
            }