#

Junjie

2 天以前 2a2959c042dc2d03360891de19b96c2cbd755cc1

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

@@ -825,7 +825,7 @@
            }

            //获取提升机命令
            LiftCommand liftCommand = liftThread.getPickAndPutCommand(wrkMast.getWrkNo(), liftSta.getLev(), wrkMast.getStaNo());
            LiftCommand liftCommand = liftThread.getPickAndPutCommand(wrkMast.getWrkNo(), liftSta.getSiteId(), wrkMast.getStaNo());
            ArrayList<LiftCommand> commands = new ArrayList<>();
            commands.add(liftCommand);

@@ -867,6 +867,10 @@
                    continue;
                }

                if (!liftThread.isDeviceIdle()) {
                    continue;
                }

                //提升机为等待确认且空闲
                if (liftProtocol.getProtocolStatus() == LiftProtocolStatusType.WAITING.id
                        && liftProtocol.getTaskNo() != 0