#

lsh

2024-01-26 2ad68dbb59b69f14783a480d311213562785b3b8

#

 src/main/java/com/zy/asrs/entity/AdjDetl.java

@@ -38,15 +38,15 @@
    private String locNo;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "变更商品编号")
    @ApiModelProperty(value= "变更规格")
    private String matnr;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    @TableField("matnr_old")
    private String matnrOld;


 src/main/java/com/zy/asrs/entity/DocLog.java

@@ -46,9 +46,9 @@
    private String docName;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    private String matnr;

    /**
@@ -94,7 +94,7 @@
//            null,    // 单据编号
//            null,    // 单据类型
//            null,    // 单据名称
//            null,    // 商品编号
//            null,    // 规格
//            null,    // 上报数量
//            null,    // 结果
//            null,    // 上报时间

 src/main/java/com/zy/asrs/entity/ManLocDetl.java

@@ -61,11 +61,11 @@
    private Double anfme;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    @TableId(value = "matnr", type = IdType.INPUT)
    @ExcelProperty(value = "商品编号")
    @ExcelProperty(value = "规格")
    private String matnr;

    /**
@@ -235,7 +235,7 @@
//            null,    // 所属货位
//            null,    // 托盘码
//            null,    // 库存余量[非空]
//            null,    // 商品编号[非空]
//            null,    // 规格[非空]
//            null,    // 商品名称
//            null,    // 名称
//            null,    // 规格

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -57,10 +57,10 @@
    private Long tagId;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "商品编号")
    @ExcelProperty(value = "商品编码")
    @ApiModelProperty(value= "规格")
    @ExcelProperty(value = "规格")
    private String matnr;


@@ -352,7 +352,7 @@
//    Mat mat = new Mat(
//            null,    // 编号
//            null,    // 所属归类
//            null,    // 商品编号
//            null,    // 规格
//            null,    // 商品名称
//            null,    // 别名
//            null,    // 规格

 src/main/java/com/zy/asrs/entity/MatCodePrint.java

@@ -6,7 +6,7 @@
public class MatCodePrint {

    /**
     * 商品编号
     * 规格
     */
    private String matNo;


 src/main/java/com/zy/asrs/entity/Pack.java

@@ -43,9 +43,9 @@
    private String barcode;

    /**
     * 商品编号
     * 规格
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    private String matnr;

    /**
@@ -119,7 +119,7 @@

//    Pack pack = new Pack(
//            null,    // 条码[非空]
//            null,    // 商品编号
//            null,    // 规格
//            null,    // 序列码
//            null,    // 订单状态
//            null,    // 状态

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -51,7 +51,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    private String matnr;

    /**

 src/main/webapp/static/js/common.js

@@ -223,17 +223,17 @@
]

var detlCols = [
    {field: 'matnr', align: 'center',title: '规格', sort:true, hide: false}
    {field: 'matnr', align: 'center',title: '规格', sort:false, hide: false}
    ,{field: 'maktx', align: 'center',title: '品名', sort:true, hide: true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
    ,{field: 'batch', align: 'center',title: '箱号', hide: true, sort:true}
    ,{field: 'batch', align: 'center',title: '箱号', hide: false, sort:true}
    ,{field: 'model', align: 'center',title: '卷号', hide: false}
    ,{field: 'brand', align: 'center',title: '木箱类型', hide: true, sort:true}
    ,{field: 'brand$', align: 'center',title: '木箱类型', hide: false, sort:true}
    ,{field: 'anfme', align: 'center',title: '数量', hide: false, sort:true}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: true}

    ,{field: 'specs', align: 'center',title: '接头', hide: true}
    ,{field: 'model', align: 'center',title: '卷号', hide: true}
    ,{field: 'specs', align: 'center',title: '接头', hide: false}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'unit', align: 'center',title: '单位', hide: true}
    ,{field: 'price', align: 'center',title: '长度', hide: false}

 src/main/webapp/views/ioWorks/locDetlQuery.html

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

 src/main/webapp/views/locDetl/locDetl.html

@@ -26,12 +26,12 @@
    </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">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
            <input class="layui-input" type="text" name="specs" placeholder="接头" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->

 src/main/webapp/views/locDetl/locDetl1.html

@@ -75,9 +75,9 @@
                            </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="matnr" class="layui-input" placeholder="输入商品编号"/>
                                <input name="matnr" class="layui-input" placeholder="输入规格"/>
                            </div>
                        </div>
                        <div class="layui-inline">

 src/main/webapp/views/locDetlStatis/locDetlStatis.html

@@ -16,7 +16,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>
    <!-- 待添加 -->

 src/main/webapp/views/manLocDetl/manLocDetl.html

@@ -75,9 +75,9 @@
                            </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="matnr" class="layui-input" placeholder="输入商品编号"/>
                                <input name="matnr" class="layui-input" placeholder="输入规格"/>
                            </div>
                        </div>
                        <div class="layui-inline">

 src/main/webapp/views/mat/mat.html

@@ -86,9 +86,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">
@@ -98,9 +98,9 @@
                            </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="specs" class="layui-input" placeholder="输入商品规格"/>
                                <input name="specs" class="layui-input" placeholder="输入接头"/>
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;
@@ -223,9 +223,9 @@

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">商品编号</label>
                    <label class="layui-form-label layui-form-required">规格</label>
                    <div class="layui-input-block">
                        <input id="matnr" name="matnr" placeholder="请输入商品编号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input id="matnr" name="matnr" placeholder="请输入规格" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>


 src/main/webapp/views/order/order.html

@@ -292,7 +292,7 @@
                            <thead>
                            <tr style="background: none">
                                <td>No.</td>
                                <td>商品编号</td>
                                <td>规格</td>
                                <!--                                <td>规格</td>-->
                                <td>箱号</td>
<!--                                <td>箱子类型</td>-->

 src/main/webapp/views/orderDetl/orderDetl.html

@@ -102,7 +102,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">规格: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="specs" placeholder="请输入规格">
                        <input class="layui-input" name="specs" placeholder="请输入接头">
                    </div>
                </div>
                <div class="layui-form-item">

 src/main/webapp/views/pack/pack.html

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

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -73,12 +73,12 @@
        </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">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="specs" placeholder="规格"  autocomplete="off">
                <input class="layui-input" type="text" name="specs" placeholder="接头"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">

 src/main/webapp/views/pakStore/locDetlQuery.html

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

 src/main/webapp/views/pakStore/matQuery.html

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

 src/main/webapp/views/pda/locDetlIframe.html

@@ -79,7 +79,7 @@
        <input id="locNo" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>商品编号</span>
        <span>规格</span>
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">

 src/main/webapp/views/pda/matQuery.html

@@ -77,7 +77,7 @@

<div class="form-box">
    <div class="form-item">
        <span>商品编号</span>
        <span>规格</span>
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
    </div>
    <div class="form-item">
@@ -85,7 +85,7 @@
        <input id="matName" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>规格</span>
        <span>接头</span>
        <input id="str2" type="text" disabled="disabled">
    </div>
    <div class="form-item">

 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">

 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">

 src/main/webapp/views/report/viewWorkOut.html

@@ -31,7 +31,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
            <input class="layui-input" type="text" name="specs" placeholder="接头" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/saas/locDetl.html

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

 src/main/webapp/views/waitPakin/waitPakin.html

@@ -21,7 +21,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>
    <!-- 日期范围 -->

 src/main/webapp/views/waitPakin/waitPakin_detail.html

@@ -36,7 +36,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">商品编号：</label>
            <label class="layui-form-label">规格：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>

 src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html

@@ -42,7 +42,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">商品编号：</label>
            <label class="layui-form-label">规格：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>

 src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html

@@ -97,9 +97,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">商品编号: </label>
                    <label class="layui-form-label layui-form-required">规格: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="matnr" placeholder="请输入规格" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
@@ -123,7 +123,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">规格: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="specs" placeholder="请输入规格">
                        <input class="layui-input" name="specs" placeholder="请输入接头">
                    </div>
                </div>
                <div class="layui-form-item">