#

luxiaotao1123

2021-03-25 c923a3aca3cfb4da23eca4666ad7367b8aa3f217

#

 src/main/java/zy/cloud/wms/manager/controller/CheckController.java

@@ -44,6 +44,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("status").orderBy("create_time", false);
        }
        return R.ok(checkService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -150,4 +150,10 @@
        return workService.stockCheck(param, getUserId());
    }

    @RequestMapping("/stock/check/auditing")
    @ManagerAuth(memo = "盘点记录审核")
    public R checkAuditing(@RequestParam Long checkId) {
        return workService.stockCheckAuditing(checkId, getUserId());
    }

}

 src/main/java/zy/cloud/wms/manager/service/WorkService.java

@@ -31,4 +31,6 @@

    R stockCheck(StoCheckParam param, Long userId);

    R stockCheckAuditing(Long checkId, Long userId);

}

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -533,4 +533,12 @@
        return R.ok();
    }

    @Override
    public R stockCheckAuditing(Long checkId, Long userId) {



        return R.ok();
    }

}

 src/main/webapp/static/js/check/check.js

@@ -208,11 +208,29 @@
                break;
            // 审核
            case 'auditing':
                layer.msg('审核成功', {icon : 1})


                layer.confirm(data.nodeUuid +'货位 盘点审核 '+ data.matnr + ' ?', function(){
                    var index = layer.load(1, {shade: [0.5,'#000']});
                    $.ajax({
                        url: baseUrl+"/work/stock/check/auditing",
                        headers: {'token': localStorage.getItem('token')},
                        data: {
                            checkId: data.id
                        },
                        dataType:'json',
                        method: 'POST',
                        success: function (res) {
                            if (res.code === 200) {
                                layer.msg(res.msg, {icon: 1})
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                            layer.close(index);
                        }
                    });
                });
                break;

        }
    });


 src/main/webapp/views/check/check.html

@@ -55,7 +55,9 @@
</script>

<script type="text/html" id="operate">
    {{#if (d.status == 1){ }}
    <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="auditing">审核</a>
    {{# } }}
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
</script>
<script type="text/html" id="checkTpl">