#
luxiaotao1123
2021-03-25 6592c7de3c380dd464e05ca4b47ae5d2d5536a6e
#
3个文件已修改
39 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/NodeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/check/check.js 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/check/check.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/NodeController.java
@@ -144,7 +144,7 @@
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition).or().like("uuid", condition);
        wrapper.like("name", condition).or().like("uuid", condition).eq("type", 3);
        Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Node node : page.getRecords()){
src/main/webapp/static/js/check/check.js
@@ -32,11 +32,11 @@
            ,{field: 'docNum', align: 'center',title: '单据编号', hide: true}
            ,{field: 'oriQty', align: 'center',title: '账面数量 (原)', style: 'font-weight: bolder'}
            ,{field: 'cekQty', align: 'center',title: '实盘数量 (现)', style: 'font-weight: bolder'}
            ,{field: 'settle$', align: 'center',title: '盈亏', templet: '#checkTpl', width: 100}
            ,{field: 'diffQty', align: 'center',title: '差值', style: 'font-weight: bolder; color: blue'}
            ,{field: 'settle$', align: 'center',title: '盈亏', templet: '#checkTpl', width: 100}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 110}
            ,{field: 'createTime$', align: 'center',title: '盘点时间'}
            ,{field: 'createBy$', align: 'center',title: '盘点人员'}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 110}
            ,{field: 'updateBy$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间', hide: true}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
@@ -209,7 +209,7 @@
            // 审核
            case 'auditing':
                layer.confirm(data.nodeUuid +'货位 盘点审核 '+ data.matnr + ' ?', function(){
                    var index = layer.load(1, {shade: [0.5,'#000']});
                    var index = layer.load(1, {shade: [0.1,'#000']});
                    $.ajax({
                        url: baseUrl+"/work/stock/check/auditing",
                        headers: {'token': localStorage.getItem('token')},
@@ -221,6 +221,7 @@
                        success: function (res) {
                            if (res.code === 200) {
                                layer.msg(res.msg, {icon: 1})
                                $(".layui-laypage-btn")[0].click();
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
@@ -329,7 +330,11 @@
        elem: '#updateTime\\$',
        type: 'datetime'
    });
    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
    });
});
src/main/webapp/views/check/check.html
@@ -35,6 +35,30 @@
            <input class="layui-input" type="text" name="maktx" placeholder="商品名称" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="settle">
                <option value="" style="display: none">盈亏情况</option>
                <option value="1">盘盈</option>
                <option value="2">盘亏</option>
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="status">
                <option value="" style="display: none">选择状态</option>
                <option value="1">待审核</option>
                <option value="2">已通过</option>
                <option value="3">取消</option>
            </select>
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="盘点起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>