zc
2025-05-07 fcb71b8fc63f74cd00d3faa76c73f4c5566ee352
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1215,7 +1215,7 @@
            }
            wrkMast.setWrkSts(WrkStsType.INBOUND_LIFT_RUN.sts);
            //wrkMast.setLiftNo(liftProtocol.getLiftNo());//提前锁定提升机
            wrkMast.setLiftNo(liftProtocol.getLiftNo());//提前锁定提升机
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);
            if (wrkMastService.updateById(wrkMast)) {
@@ -1320,10 +1320,7 @@
                return false;
            }
            if (wrkMast.getStaNo() == 1031) {
//                if (staProtocol.getOutInModel() != 1) {
//                     News.taskInfo(wrkMast.getWrkNo(),"{}任务,{}站点,没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());
//                    return false;
//                }
            } else {
                if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
                    News.taskInfo(wrkMast.getWrkNo(), "{}任务,{}站点,没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());