Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

昨天 79843611908e58f9538f8d8ebac62d3f0d01712c

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

@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.schedules;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.*;
@@ -52,7 +51,7 @@
    public void genReCheck() {
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .select(Task::getId)
                .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
                .eq(Task::getTaskStatus, TaskStsType.MISSION_INITIAL.id)
                .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
        if (tasks.isEmpty()) {
            return;
@@ -70,13 +69,16 @@
            return;
        }
        Long loginUserId = SystemAuthUtils.getLoginUserId();
        Map<Long, List<TaskItem>> taskMps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
        Map<Long, List<TaskItem>> taskMps = taskItems.stream()
                .filter(item -> Objects.nonNull(item.getOrderId()))
                .collect(Collectors.groupingBy(TaskItem::getOrderId));
        taskMps.keySet().forEach(orderId -> {
            WkOrder order = checkOrderService.getById(orderId);
            if (Objects.isNull(order)) {
                throw new CoolException("盘点单据不存在！！");
            }
            CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId));
            CheckDiff checkDiff = checkDiffService
                    .getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId));
            if (Objects.isNull(checkDiff)) {
                checkDiff = new CheckDiff();
                checkDiff.setAnfme(order.getAnfme())