#

luxiaotao1123

2021-08-11 4586c8cc13cb147caa01b1cd8c3fa6afea8d5cc0

#

 src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java

@@ -12,4 +12,6 @@

    private Double count;

    private Integer workNo;

}

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

@@ -145,7 +145,7 @@
                    now,    // 添加时间
                    9527L,    // 修改人员
                    now,    // 修改时间
                    "补仓入库"    // 备注
                    "补仓入库[立库资料：" + param.getWorkNo() + "]"    // 备注
            );
            VersionUtils.setPakin(pakin, mat);
            if (!pakinService.insert(pakin)) {

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

@@ -43,7 +43,9 @@
        EntityWrapper<Pakin> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("update_time", false);
        }
        return R.ok(pakinService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/webapp/static/js/pakin/pakin.js

@@ -24,7 +24,7 @@
            ,{field: 'wrkNo', align: 'center',title: '任务号'}
            // ,{field: 'wrkSts$', align: 'center',title: '工作状态',event: 'wrkSts', style: 'cursor:pointer'}
            // ,{field: 'zpallet', align: 'center',title: '托盘号'}
            ,{field: 'anfme', align: 'center',title: '出库数量'}
            ,{field: 'anfme', align: 'center',title: '入库数量'}
            ,{field: 'nodeId', align: 'center',title: '关联货位', hide: true}
            ,{field: 'locNo', align: 'center',title: '货位'}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
@@ -45,10 +45,10 @@
            // ,{field: 'createBy$', align: 'center',title: '添加人员',event: 'createBy', style: 'cursor:pointer'}
            // ,{field: 'createTime$', align: 'center',title: '添加时间'}
            // ,{field: 'updateBy$', align: 'center',title: '修改人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'updateTime$', align: 'center',title: '入库时间'}
            ,{field: 'memo', align: 'center',title: '备注', hide: false}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            // ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',

 src/main/webapp/views/pakin/pakin.html

@@ -18,7 +18,7 @@
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="nodeId" class="layui-input" name="node_id" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="nodeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="盘点货位" onfocus=this.blur()>
            <input id="nodeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="货位" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="nodeQueryBynodeId" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="nodeQueryBynodeIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -31,6 +31,16 @@
            <input class="layui-input" type="text" name="matnr" placeholder="商品编码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="memo" placeholder="备注" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="update_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>