parent: 12e16a4e | 补丁 | 提交 | ignore whitespace
#
Junjie
2024-08-13 47bc6df60ec490bf80534df494ef291cf85b050d 
#
6个文件已修改
113 ■■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/static/js/common.js 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/views/mat/mat.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java


@@ -47,15 +47,15 @@


    private Long tagId;




    /**


     * 商品编号


     * 品号


     */


    @ApiModelProperty(value= "商品编号")


    @ApiModelProperty(value= "品号")


    private String matnr;




    /**


     * 商品名称


     * 名称


     */


    @ApiModelProperty(value= "商品名称")


    @ApiModelProperty(value= "名称")


    private String maktx;




    /**


@@ -71,9 +71,9 @@


    private String specs;




    /**


     * 型号


     * 机型


     */


    @ApiModelProperty(value= "型号")


    @ApiModelProperty(value= "机型")


    private String model;




    /**




 zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml


@@ -23,6 +23,9 @@


        <if test="map.maktx!=null and map.maktx!='' ">


            and a.maktx like '%' + #{map.maktx} + '%'


        </if>


        <if test="map.zpallet!=null and map.zpallet!='' ">


            and a.zpallet like '%' + #{map.zpallet} + '%'


        </if>


        <if test="map.batch!=null and map.batch!='' ">


            and a.batch like '%' + #{map.batch} + '%'


        </if>




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


@@ -184,14 +184,21 @@


}




var matCols = [


    {field: 'matnr', align: 'center',title: '商品编号', width: 180}


    {field: 'matnr', align: 'center',title: '品号', width: 180}


    // {field: 'id', align: 'center',title: 'ID'}


    // ,{field: 'uuid', align: 'center',title: '编号'}


    // ,{field: 'tagId$', align: 'center',title: '所属归类'}


    ,{field: 'maktx', align: 'center',title: '商品名称', width: 200}


    ,{field: 'maktx', align: 'center',title: '名称', width: 200}


    // ,{field: 'name', align: 'center',title: '别名'}


    ,{field: 'specs', align: 'center',title: '规格'}


    ,{field: 'model', align: 'center',title: '代码', hide: false}


    ,{field: 'model', align: 'center',title: '机型', hide: false}


    ,{field: 'decrees', align: 'center',title: '制令', hide: false}


    ,{field: 'imgNum', align: 'center',title: '图号', hide: false}


    ,{field: 'weight', align: 'center',title: '重量', hide: false}


    ,{field: 'length', align: 'center',title: '长度', hide: false}


    ,{field: 'width', align: 'center',title: '宽度', hide: false}


    ,{field: 'height', align: 'center',title: '高度', hide: false}




    ,{field: 'color', align: 'center',title: '颜色', hide: true}


    ,{field: 'brand', align: 'center',title: '品牌', hide: true}


    ,{field: 'unit', align: 'center',title: '单位', hide: true}


@@ -204,10 +211,8 @@


    ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}


    ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}


    ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}


    ,{field: 'weight', align: 'center',title: '单箱净重', hide: false}


    ,{field: 'length', align: 'center',title: '单箱毛重', hide: false}


    ,{field: 'volume', align: 'center',title: '单箱体积', hide: false}


    ,{field: 'threeCode', align: 'center',title: '箱子尺寸', hide: false}




    ,{field: 'threeCode', align: 'center',title: '三方编码', hide: true}


    ,{field: 'supp', align: 'center',title: '供应商', hide: true}


    ,{field: 'suppCode', align: 'center',title: '供应商编码', hide: true}


    ,{field: 'beBatch$', align: 'center',title: '是否批次', hide: true}


@@ -221,14 +226,14 @@


    // ,{field: 'createTime$', align: 'center',title: '添加时间'}


    ,{field: 'updateBy$', align: 'center',title: '修改人员', hide: true}


    ,{field: 'updateTime$', align: 'center',title: '修改时间', hide: true}


    ,{field: 'memo', align: 'center',title: '备注', hide: true}


    ,{field: 'memo', align: 'center',title: '备注', hide: false}


]




var detlCols = [


    {field: 'matnr', align: 'center',title: '商品编号', sort:true}


    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}


    {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: 300, sort:true}


    ,{field: 'anfme', align: 'center',title: '数量'}


    ,{field: 'zpallet', align: 'center',title: '托盘条码'}


    ,{field: 'owner', align: 'center',title: '货主'}


@@ -262,11 +267,11 @@


]




var detlColsWrkDetl = [


    {field: 'matnr', align: 'center',title: '商品编号', sort:true}


    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}


    {field: 'matnr', align: 'center',title: '品号', sort:true}


    ,{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: 300, sort:true}


    ,{field: 'anfme', align: 'center',title: '数量'}


    ,{field: 'zpallet', align: 'center',title: '托盘条码'}


    ,{field: 'owner', align: 'center',title: '货主'}




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


@@ -203,31 +203,38 @@


                </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 name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips"


                        <input name="maktx" placeholder="请输入名称" class="layui-input" lay-vertype="tips"


                               lay-verify="required" required="">


                    </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 name="specs" placeholder="请输入配置" class="layui-input">


                        <input name="specs" placeholder="请输入规格" class="layui-input">


                    </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 name="weight" placeholder="请输入单箱净重格" class="layui-input">


                        <input name="weight" placeholder="请输入重量" class="layui-input">


                    </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 name="volume" placeholder="请输入单箱体积" class="layui-input">


                        <input name="length" placeholder="长度" class="layui-input">


                    </div>


                </div>




                <div class="layui-form-item">


                    <label class="layui-form-label">宽度</label>


                    <div class="layui-input-block">


                        <input name="width" placeholder="宽度" class="layui-input">


                    </div>


                </div>




@@ -235,38 +242,38 @@




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


                        <input id="matnr" name="matnr" placeholder="请输入品号" class="layui-input" lay-vertype="tips"


                               lay-verify="required" required="">


                    </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 name="model" type="number" placeholder="请输入代码" class="layui-input">


                        <input name="model" type="number" placeholder="请输入机型" class="layui-input">


                    </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 name="safeQty" placeholder="库存上限" class="layui-input">


                        <input name="decrees" placeholder="制令" class="layui-input">


                    </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 name="length" placeholder="请输入单箱毛重" class="layui-input">


                        <input name="imgNum" placeholder="图号" class="layui-input">


                    </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 name="threeCode" placeholder="请输入箱子尺寸" class="layui-input">


                        <input name="height" placeholder="高度" class="layui-input">


                    </div>


                </div>






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


@@ -58,17 +58,22 @@


        </div>


        <div class="layui-inline">


            <div class="layui-input-inline">


                <input class="layui-input" type="text" name="owner" placeholder="拥有者编号" autocomplete="off">


                <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="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="zpallet" placeholder="托盘码" autocomplete="off">


            </div>


        </div>


        <!-- 日期范围 -->




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


@@ -53,17 +53,22 @@


        </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="batch" placeholder="序列码"  autocomplete="off">


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


                <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="zpallet" placeholder="托盘码" autocomplete="off">


            </div>


        </div>


        <!-- 日期范围 -->