入出庫訂單完成狀態優化

zc

2 天以前 6f8ded21b3243313d4cad6750c1206d112330207

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

@@ -52,6 +52,7 @@
    public void genReCheck() {
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .select(Task::getId)
                .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
                .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
        if (tasks.isEmpty()) {
            return;
@@ -59,15 +60,12 @@
        List<CheckDiffItem> list = checkDiffItemService
                .list(new LambdaQueryWrapper<CheckDiffItem>()
                        .select(CheckDiffItem::getTaskItemId));
        if (list.isEmpty()) {
            return;
        }
        Set<Long> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toSet());
        List<Long> itemIds = list.stream().map(CheckDiffItem::getTaskItemId).collect(Collectors.toList());
        List<TaskItem> taskItems = taskItemService
                .list(new LambdaQueryWrapper<TaskItem>()
                        .in(TaskItem::getTaskId, taskIds)
                        .notIn(TaskItem::getId, itemIds));
                        .notIn(!itemIds.isEmpty(), TaskItem::getId, itemIds));
        if (taskItems.isEmpty()) {
            return;
        }
@@ -83,6 +81,7 @@
                checkDiff = new CheckDiff();
                checkDiff.setAnfme(order.getAnfme())
                        .setCheckType(order.getCheckType())
                        .setId(null)
                        .setOrderCode(order.getCode())
                        .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
                        .setCreateBy(loginUserId)
@@ -90,7 +89,7 @@
                        .setUpdateBy(loginUserId)
                        .setUpdateTime(new Date())
                        .setOrderId(order.getId());
                if (!checkDiffService.save(checkDiff)) {
                if (!checkDiffService.saveOrUpdate(checkDiff)) {
                    throw new CoolException("盘点差异单保存失败！！");
                }
            }
@@ -98,14 +97,14 @@
            List<TaskItem> items = taskMps.get(orderId);
            List<CheckDiffItem> diffItems = new ArrayList<>();
            CheckDiff finalCheckDiff = checkDiff;
            items.forEach(item -> {
            for (TaskItem item : items) {
                Task task = taskService.getById(item.getTaskId());
                if (Objects.isNull(task)) {
                    throw new CoolException("数据错误：任务不存在！！");
                }
                CheckDiffItem checkDiffItem = new CheckDiffItem();
                BeanUtils.copyProperties(item, checkDiffItem);
                checkDiffItem.setCheckId(finalCheckDiff.getId())
                checkDiffItem.setCheckId(checkDiff.getId())
                        .setTaskItemId(item.getId())
                        .setTaskId(item.getTaskId())
                        .setCreateBy(loginUserId)
@@ -113,10 +112,10 @@
                        .setBarcode(task.getBarcode())
                        .setUpdateBy(loginUserId)
                        .setUpdateTime(new Date())
                        .setOrderCode(finalCheckDiff.getOrderCode());
                        .setOrderCode(checkDiff.getOrderCode());
                diffItems.add(checkDiffItem);

                if (Objects.isNull(finalCheckDiff.getAreaId())) {
                if (Objects.isNull(checkDiff.getAreaId())) {
                    Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
                            .eq(Loc::getCode, task.getOrgLoc())
                            .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));
@@ -124,12 +123,14 @@
                        throw new CoolException("盘点库位不存在！！");
                    }
                    finalCheckDiff.setAreaId(loc.getAreaId()).setAreaName(loc.getAreaId$());

                    if (!checkDiffService.updateById(finalCheckDiff)) {
                        throw new CoolException("库区信息修改失败！！");
                    }
                }
            });
            }

            checkDiff.setAreaId(finalCheckDiff.getAreaId()).setAreaName(finalCheckDiff.getAreaName());

            if (!checkDiffService.updateById(checkDiff)) {
                throw new CoolException("库区信息修改失败！！");
            }

            if (!checkDiffItemService.saveBatch(diffItems)) {
                throw new CoolException("盘点差异单保存失败！！");