#

lsh

2024-09-03 560cfccea702316d4edec94c3699047fab96880c

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java

@@ -21,7 +21,7 @@
    @ExcelProperty(index = 1, value = "二级分类")
    private String secClass;

    @ExcelProperty(index = 2, value = "商品编号")
    @ExcelProperty(index = 2, value = "品号")
    private String matnr;

    @ExcelProperty(index = 3, value = "商品名称")

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java

@@ -14,7 +14,7 @@
    @ExcelProperty(index = 0, value = "货位")
    private String node_name;

    @ExcelProperty(index = 1, value = "商品编号")
    @ExcelProperty(index = 1, value = "品号")
    private String matnr;

    @ExcelProperty(index = 2, value = "商品名称")

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java

@@ -21,7 +21,7 @@
    @ExcelProperty(index = 1, value = "数量")
    private Double anfme;

    @ExcelProperty(index = 2, value = "商品编号")
    @ExcelProperty(index = 2, value = "品号")
    private String matnr;

    @ExcelProperty(index = 3, value = "商品名称")

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

@@ -159,7 +159,7 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'matnr', title: '品号', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '序列码'},
                            {field: 'anfme', title: '数量'},
@@ -311,7 +311,7 @@
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '品名', width: 160},
                        {field: 'matnr', title: '品号', width: 160},
                        {field: 'maktx', title: '名称', width: 200},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', 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,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', 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,7 +24,7 @@
        cols: [[
            {type: 'numbers', fixed: 'left'}
            ,{field: 'locNo$', align: 'center',title: '库位'}
            ,{field: 'matnr', 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}

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

@@ -94,9 +94,9 @@
                    <!-- 表格工具栏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">

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

@@ -95,9 +95,9 @@
                    <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">

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

@@ -98,9 +98,9 @@
                    </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">

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

@@ -92,9 +92,9 @@
                    </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">

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

@@ -53,7 +53,7 @@
        </div>
        <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">

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

@@ -92,9 +92,9 @@
                    </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">

 zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html

@@ -20,7 +20,7 @@
<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" style="width: 300px">

 zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html

@@ -21,7 +21,7 @@
<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" style="width: 300px">

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

@@ -25,7 +25,7 @@
<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">

 zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html

@@ -28,7 +28,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>物　　料：</label>
            <label class="layui-form-label"><span class="not-null">*</span>品　　号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text" lay-verify="required" >
            </div>