#

Junjie

2023-09-30 8a959ef64f611703b6150bd48e859cfe7ada1363

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

@@ -1202,7 +1202,7 @@
            }

            //调度小车避让
            boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getLocNo()), wrkMast.getShuttleNo(), shuttleThread);
            boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getShuttleNo(), shuttleThread);
            if (!result) {
                return false;
            }
@@ -1318,6 +1318,12 @@
                                //释放提升机令牌
                                liftProtocol.setToken(0);
                            }

                            if (wrkMast.getMk() == null || !wrkMast.getMk().equals("Y")) {
                                //不需要用到机械臂，直接转29.出库完成
                                wrkMast.setWrkSts(29L);
                            }

                            break;
                        case 106://106.提升机搬运中 ==> 107.提升机搬运完成
                            wrkMast.setWrkSts(107L);