lsh#

1

14 小时以前 7a92ebbfb8227ff30ebe3300cc9db263a75b7e22

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java

@@ -58,7 +58,7 @@
     * 自动生成库位明细
     */
    @Transactional(rollbackFor = Exception.class)
    @Scheduled(cron = "0/25 * * * * ?")
//    @Scheduled(cron = "0/25 * * * * ?")
    public void insertRandomMats() {
        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type));
        for (Loc loc : list) {
@@ -107,9 +107,13 @@
        //获取任务列表中，为盘点出库的任务
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type,
                        TaskType.TASK_TYPE_PICK_IN.type,
                        TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
                        TaskType.TASK_TYPE_CHECK_IN.type)));
//                        TaskType.TASK_TYPE_PICK_IN.type,
                        TaskType.TASK_TYPE_PICK_AGAIN_OUT.type
//                                ,
//                        TaskType.TASK_TYPE_CHECK_IN.type
                        )
                )
        );

        if (!tasks.isEmpty()) {
            tasks.forEach(task -> {
@@ -298,29 +302,37 @@
        if (Cools.isEmpty(autoRunArea)) {
            return;
        }
        List<Integer> array = new ArrayList<>();
        List<String> list = new ArrayList<>();
        for (char c : autoRunArea.toCharArray()) {
            switch (c) {
                case '1':
                    xx(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
                    array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
                    list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST);
                    break;
                case '2':
                    xx(LocGroupConstant.RIGHT_LOC_ROW_LIST);
                    array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST);
                    list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST);
                    break;
                case '3':
                    xx(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
                    array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
                    list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST);
                    break;
                case '4':
                    xx(LocGroupConstant.LEFT_LOC_ROW_LIST);
                    array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST);
                    list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST);
                    break;
                case '5':
                    xx(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
                    array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
                    list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST);
                    break;
                default:
                    break;
            }
        }
    }
        xx(array);

    }

    private void xx(List<Integer> locGroupList) {
        Integer startRow = Collections.min(locGroupList);