Merge branch 'rcs_master' into ctu_conveyor

zhang

6 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java

@@ -113,7 +113,6 @@
                    .orderByDesc(Segment::getId).last("LIMIT 1"));
            if (null == lastSeg) {
                return false;
//                continue;
            }
            Travel travel = travelService.getById(lastSeg.getTravelId());
            if (travel.getState().equals(TravelStateType.FINISH.toString())) {
@@ -128,7 +127,16 @@
                        && (segment.getPosType().equals(TaskPosDto.PosType.ORI_STA.toString())
                            || segment.getPosType().equals(TaskPosDto.PosType.DEST_STA.toString()))
                ) {
                    return true;
                    return 0 < staReserveService.count(new LambdaQueryWrapper<StaReserve>()
                            .eq(StaReserve::getStaId, staId)
                            .eq(StaReserve::getTaskId, segment.getTaskId())
                            .eq(StaReserve::getSegmentId, segment.getId())
                            .eq(StaReserve::getState, StaReserveStateType.WAITING.toString())
//                            .eq(StaReserve::getType, StaReserveType.IN.toString())
                            .eq(StaReserve::getStatus, StatusType.ENABLE.val)
                            .orderByDesc(StaReserve::getUpdateTime)
//                            .last("limit 1")
                    );
                }
            }
        }