#入库作搜索栏：品号，名称，制令，拥有者，时间

lsh

2024-08-19 7fb33fe84ce97e402c16d0d5558c914e621cdcd1

#入库作搜索栏：品号，名称，制令，拥有者，时间

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java

@@ -77,8 +77,16 @@
        if (!Cools.isEmpty(param.get("maktx"))) {
            wrapper.eq("maktx", param.get("maktx"));
        }
        if (!Cools.isEmpty(param.get("decrees"))) {
            wrapper.eq("decrees", param.get("decrees"));
        }
//        if (!Cools.isEmpty(param.get("owner$"))) {
//            wrapper.eq("owner", param.get("owner$"));
//        }
        param.remove("matnr");
        param.remove("maktx");
        param.remove("decrees");
//        param.remove("owner$");
        allLike(Mat.class, param.keySet(), wrapper, condition);
        return R.ok(matService.page(new Page<>(curr, limit), wrapper));
    }

 zy-asrs-wms/src/main/webapp/static/js/common.js

@@ -233,7 +233,7 @@
    {field: 'matnr', align: 'center',title: '品号', sort:true}
    ,{field: 'maktx', align: 'center',title: '名称', sort:true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
    ,{field: 'batch', align: 'center',title: '批号', width: 80, sort:true}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'owner', align: 'center',title: '货主'}
@@ -282,7 +282,7 @@
    ,{field: 'maktx', align: 'center',title: '名称', sort:true, width: 150}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'orderType', align: 'center',title: '单据类型', hide: false}
    ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
    ,{field: 'batch', align: 'center',title: '批号', width: 80, sort:true}
    ,{field: 'anfme', align: 'center',title: '数量', width: 70}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', width: 100}
    ,{field: 'owner', align: 'center',title: '货主', width: 80}

 zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js

@@ -6,7 +6,7 @@
        ,{field: 'maktx', align: 'center',title: '名称', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
        ,{field: 'orderType', align: 'center',title: '单据类型', hide: false}
        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'batch', align: 'center',title: '批号', width: 80, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量', width: 100}
        ,{field: 'zpallet', align: 'center',title: '托盘码'}
        ,{field: 'templet', align: 'center',title: '机型',templet:function(row){

 zy-asrs-wms/src/main/webapp/static/js/order/order.js

@@ -311,8 +311,8 @@
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'matnr', title: '品名', width: 160},
                        {field: 'maktx', title: '名称', width: 200},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},

 zy-asrs-wms/src/main/webapp/static/js/order/out.js

@@ -32,8 +32,8 @@
            {type: 'checkbox'}
            ,{type: 'numbers', title: '#'}
            ,{field: 'orderNo', align: 'center',title: '单据编号', templet: '#orderNoTpl', width: 160}
            ,{field: 'matnr', align: 'center',title: '商品编码', width: 160}
            ,{field: 'maktx', align: 'center',title: '商品名称', width: 200}
            ,{field: 'matnr', align: 'center',title: '品名', width: 160}
            ,{field: 'maktx', align: 'center',title: '名称', width: 200}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'origin', align: 'center',title: '仓库号'}
            // ,{field: 'anfme', align: 'center',title: '数量'}

 zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js

@@ -29,8 +29,8 @@
            ,{field: 'orderNo', align: 'center',title: '单据编号'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'qty', align: 'center',title: ''}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'matnr', align: 'center',title: '品名'}
            ,{field: 'maktx', align: 'center',title: '名称'}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'model', align: 'center',title: '型号'}

 zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js

@@ -27,8 +27,8 @@
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'orderId$', align: 'center',title: '订单内码'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'matnr', align: 'center',title: '品名'}
            ,{field: 'maktx', align: 'center',title: '名称'}
            ,{field: 'name', align: 'center',title: '名称'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'model', align: 'center',title: '型号'}

 zy-asrs-wms/src/main/webapp/static/js/prior/prior.js

@@ -28,8 +28,8 @@
            ,{field: 'uuid', align: 'center',title: '编号'}
            ,{field: 'name', align: 'center',title: '推荐名'}
            ,{field: 'matId$', align: 'center',title: '关联商品'}
            ,{field: 'matnr', align: 'center',title: '商品编号'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'matnr', align: 'center',title: '品名'}
            ,{field: 'maktx', align: 'center',title: '名称'}
            ,{field: 'nodeId', align: 'center',title: '关联货位'}
            ,{field: 'nodeName', align: 'center',title: '货位名称'}
            ,{field: 'safeQua', align: 'center',title: '安全库存'}

 zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '商品编号'}
        ,{field: 'maktx', align: 'center',title: '商品名称'}
        ,{field: 'matnr', align: 'center',title: '品名'}
        ,{field: 'maktx', align: 'center',title: '名称'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];


 zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '商品编号'}
        ,{field: 'maktx', align: 'center',title: '商品名称'}
        ,{field: 'matnr', align: 'center',title: '品名'}
        ,{field: 'maktx', align: 'center',title: '名称'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];


 zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js

@@ -24,8 +24,8 @@
        cols: [[
            {type: 'numbers', fixed: 'left'}
            ,{field: 'locNo$', align: 'center',title: '库位'}
            ,{field: 'matnr', align: 'center',title: '商品编号'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'matnr', align: 'center',title: '品名'}
            ,{field: 'maktx', align: 'center',title: '名称'}
            ,{field: 'progress', align: 'center',title: '使用情况', templet: '#progressTpl', width: 350}
            ,{field: 'status', align: 'center',title: '警报', templet: '#statusTpl', width: 100}
            ,{field: 'safeQua', align: 'center',title: '安全库存量', style: 'font-weight: bold'}

 zy-asrs-wms/src/main/webapp/views/mat/mat.html

@@ -94,15 +94,15 @@
                    <!-- 表格工具栏2 -->
                    <div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品编号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">品名:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                                <input name="matnr" class="layui-input" placeholder="输入品名"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品名称:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">名称:</label>
                            <div class="layui-input-inline">
                                <input name="maktx" class="layui-input" placeholder="输入商品名称"/>
                                <input name="maktx" class="layui-input" placeholder="输入名称"/>
                            </div>
                        </div>
                        <div class="layui-inline">

 zy-asrs-wms/src/main/webapp/views/order/out.html

@@ -95,15 +95,15 @@
                    <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="matnr" class="layui-input" placeholder="商品编码"/>
                                    <input name="matnr" class="layui-input" placeholder="品名"/>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">商品名称:</label>
                                <label class="layui-form-label">名称:</label>
                                <div class="layui-input-inline">
                                    <input name="maktx" class="layui-input" placeholder="商品名称"/>
                                    <input name="maktx" class="layui-input" placeholder="名称"/>
                                </div>
                            </div>
                            <div class="layui-inline">

 zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html

@@ -98,15 +98,15 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品编码: </label>
                    <label class="layui-form-label">品名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编码">
                        <input class="layui-input" name="matnr" placeholder="请输入品名">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品名称: </label>
                    <label class="layui-form-label">名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入商品名称">
                        <input class="layui-input" name="maktx" placeholder="请输入名称">
                    </div>
                </div>
                <div class="layui-form-item">

 zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html

@@ -92,15 +92,15 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品编码: </label>
                    <label class="layui-form-label">品名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编码">
                        <input class="layui-input" name="matnr" placeholder="请输入品名">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品名称: </label>
                    <label class="layui-form-label">名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入商品名称">
                        <input class="layui-input" name="maktx" placeholder="请输入名称">
                    </div>
                </div>
                <div class="layui-form-item">

 zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html

@@ -56,16 +56,26 @@
                <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="batch" placeholder="批号"  autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline">-->
<!--            <div class="layui-input-inline">-->
<!--                <input class="layui-input" type="text" name="batch" placeholder="批号"  autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="maktx" placeholder="名称" autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline">-->
<!--            <div class="layui-input-inline">-->
<!--                <input class="layui-input" type="text" name="decrees" placeholder="制令" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="owner" placeholder="拥有者ID" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">

 zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html

@@ -30,12 +30,27 @@
        <div id="search-box" class="layui-form layui-card-header">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
                    <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="maktx" placeholder="商品名称" autocomplete="off">
                    <input class="layui-input" type="text" name="maktx" placeholder="名称" autocomplete="off">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="decrees" placeholder="制令" autocomplete="off">
                </div>
            </div>
<!--            <div class="layui-inline">-->
<!--                <div class="layui-input-inline">-->
<!--                    <input class="layui-input" type="text" name="owner$" placeholder="拥有者" autocomplete="off">-->
<!--                </div>-->
<!--            </div>-->
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="maktx" placeholder="名称" autocomplete="off">
                </div>
            </div>
            <!-- 日期范围 -->

 zy-asrs-wms/src/main/webapp/views/prior/prior.html

@@ -92,15 +92,15 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品编号: </label>
                    <label class="layui-form-label">品名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编号">
                        <input class="layui-input" name="matnr" placeholder="请输入品名">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品名称: </label>
                    <label class="layui-form-label">名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入商品名称">
                        <input class="layui-input" name="maktx" placeholder="请输入名称">
                    </div>
                </div>
                <div class="layui-form-item">

 zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html

@@ -25,12 +25,12 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <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="maktx" placeholder="商品名称" autocomplete="off">
            <input class="layui-input" type="text" name="maktx" placeholder="名称" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">