no message

skyouc

昨天 c21db7895425a870452d1dc03175cc4f4f1c0aab

no message

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -63,6 +63,7 @@

        List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
                .eq(CheckDiffItem::getBarcode, barcode)
                .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
                .eq(CheckDiffItem::getOrderCode, checkCode)
        );
        if (checkDiffItems.isEmpty()) {
@@ -77,8 +78,6 @@
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
            return R.error("任务状态不是等待确认");
        }


        return R.ok(checkDiffItems);
    }


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

@@ -81,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)
@@ -95,6 +96,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 +115,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("盘点差异单保存失败！！");