#

vincentlu

10 天以前 c851a06ffee1079c178d2e5a64b2f1d306c6f9a9

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java

@@ -289,6 +289,7 @@
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(destSta, task, agv.getId());

                // task
                task.setOriLoc(oriLoc.getId());
@@ -310,6 +311,7 @@
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(oriSta, task, agv.getId());

                // destLoc
                if (!Cools.isEmpty(param.getEndLocNo())) {
@@ -350,6 +352,7 @@
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(oriSta, task, agv.getId());

                // destSta
                if (!Cools.isEmpty(param.getEndStaNo())) {
@@ -364,6 +367,7 @@
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(destSta, task, agv.getId());

                // task
                task.setOriSta(oriSta.getId());

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

@@ -128,9 +128,10 @@
    public Boolean cancel(Long segmentId, Long userId) {
        Date now = new Date();
        Segment segment = this.getById(segmentId);
        Long travelId = segment.getTravelId();
        String groupId = segment.getGroupId();
        // update segment list
        List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupId));
        List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTravelId, travelId));
        for (Segment seg : segmentList) {
            Task task = taskService.getById(segment.getTaskId());
            if (task != null &&
@@ -145,7 +146,9 @@
        }
        this.processNext(segmentList);
        // update action list
        if (!Cools.isEmpty(groupId)) {
        actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
        }
        return Boolean.TRUE;
    }


 zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml

@@ -13,7 +13,6 @@
        AND type = #{type}
        AND deleted = 0
        AND status = 1
--           AND state IN ('WAITING','RESERVED')
    </update>

    <update id="updateStateToWaiting">
@@ -27,7 +26,6 @@
        AND type = #{type}
        AND deleted = 0
        AND status = 1
--         AND state IN ('RESERVED','WAITING')
    </update>

    <update id="updateStateBackToWaiting">
@@ -40,7 +38,6 @@
        AND type = #{type}
        AND deleted = 0
        AND status = 1
--         AND state = 'WAITING'
    </update>

</mapper>