#

mrzhssss

2022-03-22 8f98356e0fc445509bb1d3c7754277eb9d25e015

#

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

@@ -208,8 +208,8 @@
         */
        Integer seqNo = 1;
        for (Order order : orders) {
            if (order.getSettle() != 2L) {
                return R.error("仅支持'未拣货'状态生成波次");
            if (order.getSettle() != 1L) {
                return R.error("仅支持'待处理'状态生成波次");
            }
        }


 src/main/webapp/static/js/pickout/pickout.js

@@ -101,6 +101,13 @@
            })
        });
    }
    form.on('submit(leftResearch)', function (data) {

        leftTB.reload({where: {wrk_no: data.field.docName}});
        return false;
    });



    /****************************************** 右边表 *************************************************/
    // 数据渲染
@@ -142,7 +149,7 @@
            ,{field: 'updateBy$', align: 'center',title: '修改人员ID', hide:true}
            ,{field: 'memo', align: 'center',title: '备注', hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150, hide:true}
        ]],
        request: {
            pageName: 'curr',
@@ -167,7 +174,12 @@
            limit();
        }
    });
    /* 表格2搜索 */
    form.on('submit(rightSearch)', function (data) {

        tableIns.reload({where: data.field , page: {curr: 1}});
        return false;
    });
    // // 监听排序事件
    // table.on('sort(pickout)', function (obj) {
    //     var searchData = {};
@@ -259,19 +271,19 @@
    //     tableReload(false);
    // });
    //
    // // 时间选择器
    // function layDateRender() {
    //         layDate.render({
    //     elem: '#createTime\\$',
    //     type: 'datetime'
    // });
    //     layDate.render({
    //     elem: '#updateTime\\$',
    //     type: 'datetime'
    // });
    //
    // }
    // layDateRender();
    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#createTime\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#updateTime\\$',
        type: 'datetime'
    });

    }
    layDateRender();

});


 src/main/webapp/views/pickout/pickout.html

@@ -86,13 +86,13 @@
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline">
                                <label class="layui-form-label">订单编号:</label>
                                <label class="layui-form-label">商品编码:</label>
                                <div class="layui-input-inline">
                                    <input name="id" class="layui-input"type="text" name="id" placeholder="编号" autocomplete="off"/>
                                    <input name="matnr" class="layui-input"type="text"  placeholder="编码" autocomplete="off"/>
                                </div>
                            </div>
                            <div class="layui-inline">&emsp;
                                <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                                <button class="layui-btn icon-btn" lay-filter="rightSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                                <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -136,12 +136,14 @@
</script>

<script type="text/html" id="operate">
    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">打印拣货单</a>
    {{# } }}
    {{#if (d.wrkSts == 3){ }}
    <a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">完成</a>
    {{# } }}
    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">打印拣货单</a>
    {{# } }}



<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}