Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-07-24 5c90daa2c919f3f07df0a154ff91f0e015bf8d66

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java

@@ -37,6 +37,14 @@
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/getCheckTaskItemList2")
    @ApiOperation("查询盘点任务列表,直接扫容器码")
    public R getCheckTaskItemList2(@RequestBody Map<String, String> map) {

        return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @GetMapping("/getCheckDiffReasonList")
    @ApiOperation("查询盘点差异原因")
    public R getCheckDiffReasonList() {

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

@@ -15,4 +15,6 @@
    R saveCheckDiff(SaveCheckDiffParams saveCheckDiffParams,Long loginUserId);

    R selectAddMatnr(Map<String, String> map);

    R getCheckTaskItemList2(String barcode);
}

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

@@ -214,4 +214,36 @@
                ;
        return R.ok(checkDiffItem);
    }

    @Override
    public R getCheckTaskItemList2(String barcode) {
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        if (null == task) {
            throw new CoolException("未找到容器号对应任务");
        }
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
            return R.error("任务状态不是等待确认");
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (Cools.isEmpty(taskItems)){
            throw new CoolException("未找到该容器码对应的任务明细");
        }
        String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);
        CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));
        if (null == checkDiff) {
            return R.error("未找到盘点差异单");
        }
        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, sourceCode)
        );
        if (checkDiffItems.isEmpty()) {
            throw new CoolException("此条码不在当前盘点单中");
        }

        return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
    }
}