#

luxiaotao1123

2024-10-28 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023

#

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

@@ -2,10 +2,14 @@

import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.service.LaneService;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * Created by vincent on 10/24/2024
@@ -16,9 +20,13 @@

    @Autowired
    private LaneService laneService;
    @Autowired
    private TaskService taskService;

    @GetMapping("/lanes")
    public R getLanes() {
        List<Task> taskList = taskService.findTasksByLaneHash("4b81ebaedd8ed7662d37b63e20dec5dd089d4c32136b8826c6323839fe51938e");

        return R.ok().add(laneService.search("00000010"));
    }


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java

@@ -76,10 +76,15 @@

        Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);

        // checkout lane
        Lane originLane = taskService.checkoutOriginLane(task);
        Lane destinationLane = taskService.checkoutDestinationLane(task);

        // allocate about origin
        taskService.findTasksByLaneHash(originLane.getHashCode());

        // allocate about destination
        taskService.findTasksByLaneHash(destinationLane.getHashCode());

        /**
         * 1.   判断task的起始点和目的点所在的巷道承载任务数量，
@@ -90,6 +95,10 @@
         *      判断逻辑：背篓数量最少的小车轮询的时候，优先级最高
         */


        task.setOriLaneHash(originLane.getHashCode());
        task.setDestLaneHash(destinationLane.getHashCode());

        return null;
    }


 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java

@@ -119,7 +119,7 @@
     * 起始巷道哈希
     */
    @ApiModelProperty(value= "起始巷道哈希")
    private Long oriLaneHash;
    private String oriLaneHash;

    /**
     * 目标站
@@ -143,7 +143,7 @@
     * 目标巷道哈希
     */
    @ApiModelProperty(value= "目标巷道哈希")
    private Long destLaneHash;
    private String destLaneHash;

    /**
     * 空板

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java

@@ -30,4 +30,6 @@

    Lane checkoutDestinationLane(Task task);

    List<Task> findTasksByLaneHash(String laneHash);

}

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

@@ -161,6 +161,14 @@
        return laneService.search(codeService.getById(codeId).getData());
    }

    @Override
    public List<Task> findTasksByLaneHash(String laneHash) {
        if (Cools.isEmpty(laneHash)) {
            return new ArrayList<>();
        }
        return this.list(new LambdaQueryWrapper<Task>().eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash));
    }

    @Transactional
    public void maintainLocSts(Task task, Boolean complete) {
        Loc oriLoc = null; Loc destLoc = null;