no message

skyouc

昨天 93768902560c4e20ffe44c82288fe90137e264cb

no message

 src/main/java/com/zy/asrs/entity/param/QueryTaskParam.java

@@ -7,4 +7,8 @@

    private String taskNo;

    private String taskType;

    private String agvSite;

}

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -20,10 +20,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/7/7
@@ -83,8 +81,6 @@
            }
        }
    }


    /**
     * 任务自动下发出库任务
     *
@@ -97,29 +93,70 @@
        if (wrkMasts.isEmpty()) {
            return;
        }
//        Collections.shuffle(wrkMasts);
        wrkMasts.forEach(wrkMast -> {
            WorkTaskParams params = new WorkTaskParams();
            if (wrkMast.getIoType().equals(11)) {
                CompleteParam param = new CompleteParam();
                param.setTaskNo(wrkMast.getWrkNo() + "");
                param.setSourceLocNo(wrkMast.getSourceLocNo());
                param.setLocNo(wrkMast.getLocNo());
//                param.set
                mobileService.taskMove(param, 9527L);
            } else if (wrkMast.getIoType() > 100) {
                params.setType("out")
                        .setTaskNo(wrkMast.getWrkNo() + "")
                        .setLocNo(wrkMast.getSourceLocNo())
                        .setBarcode(wrkMast.getBarcode())
                        .setStaNo(wrkMast.getStaNo())
                        .setTaskPri(wrkMast.getIoPri().intValue());
                wcsApiService.pubWrkToWcs(params);
        Map<Integer, List<WrkMast>> listMap = wrkMasts.stream().collect(Collectors.groupingBy(WrkMast::getCrnNo));
        listMap.keySet().forEach(key -> {
            List<WrkMast> wrkMasts1 = listMap.get(key);
            Collections.shuffle(wrkMasts1);
            Integer crnNos = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", key));
            if (crnNos < 6) {
                wrkMasts1.forEach(wrkMast -> {
                    WorkTaskParams params = new WorkTaskParams();
                    if (wrkMast.getIoType().equals(11)) {
                        CompleteParam param = new CompleteParam();
                        param.setTaskNo(wrkMast.getWrkNo() + "");
                        param.setSourceLocNo(wrkMast.getSourceLocNo());
                        param.setLocNo(wrkMast.getLocNo());
                        mobileService.taskMove(param, 9527L);
                    } else if (wrkMast.getIoType() > 100) {
                        params.setType("out")
                                .setTaskNo(wrkMast.getWrkNo() + "")
                                .setLocNo(wrkMast.getSourceLocNo())
                                .setBarcode(wrkMast.getBarcode())
                                .setStaNo(wrkMast.getStaNo())
                                .setTaskPri(wrkMast.getIoPri().intValue());
                        wcsApiService.pubWrkToWcs(params);
                    }
                });
            }
        });

    }


//    /**
//     * 任务自动下发出库任务
//     *
//     * @author Ryan
//     * @date 2026/1/10 14:42
//     */
//    @Scheduled(cron = "0/5 * * * * ? ")
//    private void autoPubTasks() {
//        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(11L, 1L)));
//        if (wrkMasts.isEmpty()) {
//            return;
//        }
////        Collections.shuffle(wrkMasts);
//        wrkMasts.forEach(wrkMast -> {
//            WorkTaskParams params = new WorkTaskParams();
//            if (wrkMast.getIoType().equals(11)) {
//                CompleteParam param = new CompleteParam();
//                param.setTaskNo(wrkMast.getWrkNo() + "");
//                param.setSourceLocNo(wrkMast.getSourceLocNo());
//                param.setLocNo(wrkMast.getLocNo());
////                param.set
//                mobileService.taskMove(param, 9527L);
//            } else if (wrkMast.getIoType() > 100) {
//                params.setType("out")
//                        .setTaskNo(wrkMast.getWrkNo() + "")
//                        .setLocNo(wrkMast.getSourceLocNo())
//                        .setBarcode(wrkMast.getBarcode())
//                        .setStaNo(wrkMast.getStaNo())
//                        .setTaskPri(wrkMast.getIoPri().intValue());
//                wcsApiService.pubWrkToWcs(params);
//            }
//        });
//
//    }

    /**
     * AGV任务自动下发出库任务
     *

 src/main/java/com/zy/common/service/CommonService.java

@@ -182,7 +182,7 @@
                    int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
                    if (count < minCount) {
                        minCount = count;
                        crnNo = 6;
                        crnNo = i;
                    }
                }