1

zhang

18 小时以前 1449f52d572080616a40e72ded89c5ae53a5b546

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java

@@ -98,19 +98,19 @@

        if (mode != null && mode == 1) {
            // 入库
            this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum,"3-1");
            this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum,"4-1");
            this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum);
            this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum);
        } else if (mode == 2) {
            // 出库
            this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum,"3-1");
            this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum,"4-1");
            this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum);
            this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum);
        }

    }


    // 入库
    private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum,String sta) {
    private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum) {
        Integer startRow = Collections.min(locGroupList);
        Integer endRow = Collections.max(locGroupList);

@@ -126,7 +126,6 @@
        if (Cools.isEmpty(stockList)) {
            return;
        }
        Collections.shuffle(stockList);

        // IDLE
        LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
@@ -147,7 +146,7 @@
        for (int i = 0; i <taskNum; i++) {
            Loc idleLoc = idleList.get(i);
            TaskDto taskDto = new TaskDto();
            taskDto.setOriSta(sta);
            taskDto.setOriSta(stockList.get(0).getStaNo());
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setPriority(100);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
@@ -160,7 +159,7 @@


    // 出库
    private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum,String sta) {
    private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum) {
        Integer startRow = Collections.min(locGroupList);
        Integer endRow = Collections.max(locGroupList);

@@ -175,7 +174,6 @@
        if (Cools.isEmpty(idleList)) {
            return;
        }
        Collections.shuffle(idleList);

        // LOC STOCK
        LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
@@ -198,7 +196,7 @@

            TaskDto taskDto = new TaskDto();
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestSta(sta);
            taskDto.setDestSta(idleList.get(0).getStaNo());
            taskDto.setPriority(100);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
            taskDto.setMemo(memo);