盘点 功能调整优化

skyouc

2 天以前 390e00e616d40e708bd14b6f38ba4a76542a487d

盘点 功能调整优化

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

@@ -399,13 +399,31 @@
        task.setTaskStatus(TaskStsType.GENERATE_IN.id)
                .setTaskCode(ruleCode)
                .setTargLoc(task.getOrgLoc())
                .setOrgSite(task.getTargSite())
                .setTaskType(TaskType.TASK_TYPE_CHECK_IN.type)
                .setUpdateTime(new Date());
        if (!taskService.updateById(task)) {
            throw new CoolException("任务状态修改失败！！");
        }

        uploadCheckResult(task);
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (Objects.isNull(taskItems) || taskItems.isEmpty()) {
            throw new CoolException("数据错误，任务明细不存在！！");
        }

        List<TaskItem> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("items")), TaskItem.class);
        items.forEach(taskItem -> {
            taskItems.forEach(item -> {
                if (taskItem.getFieldsIndex().equals(item.getFieldsIndex())) {
                    item.setAnfme(taskItem.getCheckQty());
                    if (!taskItemService.updateById(item)) {
                        throw new CoolException("盘点明细修改失败！！");
                    }
                }
            });
        });

//        uploadCheckResult(task);

        return R.ok("提交成功");
    }
@@ -429,7 +447,6 @@
        List<ReportDataParam> reportDataParams = new ArrayList<>();
        taskItems.forEach(taskItem -> {
            ReportDataParam dataParam = new ReportDataParam();

            User user = userService.getById(taskItem.getUpdateBy());
            String nickName = null;
            if (!Objects.isNull(user)) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java

@@ -117,6 +117,10 @@
    @ApiModelProperty("库存数量")
    private Double workQty;

    @ApiModelProperty("盘点数量")
    @TableField(exist = false)
    private Double checkQty;

    /**
     * 完成数量
     */