1

zhang

2025-06-17 21b80e79792b800eb3e409340d31be1354878a24

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

@@ -105,6 +105,16 @@
    }

    @Override
    public List<Segment> getByAgvAndTaskAndBackpack(Long agvId,List<Long> taskIds, Integer backpack) {
        return this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getBackpack, backpack)
                .in(Segment::getTaskId, taskIds)
                .orderByAsc(Segment::getSerial)
        );
    }

    @Override
    public List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo) {
        return this.baseMapper.getGroupNo(state.toString(), agvId, groupNo);
    }
@@ -131,7 +141,7 @@
        for (Segment seg : segmentList) {
            Task task = taskService.getById(segment.getTaskId());
            if (task != null &&
                    (!task.getTaskTypeEl().equals(TaskStsType.COMPLETE.toString()) || !task.getTaskTypeEl().equals(TaskStsType.CANCEL.toString()))) {
                    (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
                throw new CoolException("the task is not finish");
            }
            seg.setState(SegmentStateType.FINISH.toString());