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

lbq

5 天以前 18c0ffb02bbc0aa7eeea1d79a210260880b964f8

 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.GENERATE_OUT.id)
                .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
        if (tasks.isEmpty()) {
            return;
@@ -70,17 +69,21 @@
            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())
                        .setCheckType(order.getCheckType())
                        .setId(null)
                        .setOrderCode(order.getCode())
                        .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
                        .setCreateBy(loginUserId)
@@ -95,6 +98,7 @@

            List<TaskItem> items = taskMps.get(orderId);
            List<CheckDiffItem> diffItems = new ArrayList<>();
            CheckDiff finalCheckDiff = checkDiff;
            for (TaskItem item : items) {
                Task task = taskService.getById(item.getTaskId());
                if (Objects.isNull(task)) {
@@ -113,22 +117,22 @@
                        .setOrderCode(checkDiff.getOrderCode());
                diffItems.add(checkDiffItem);

//                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));
//                    if (Objects.isNull(loc)) {
//                        throw new CoolException("盘点库位不存在！！");
//                    }
////                    finalCheckDiff.setAreaId(loc.getAreaId()).setAreaName(loc.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));
                    if (Objects.isNull(loc)) {
                        throw new CoolException("盘点库位不存在！！");
                    }
                    finalCheckDiff.setAreaId(loc.getAreaId()).setAreaName(loc.getAreaId$());
                }
            }

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

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

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