1.0.5

admin

2021-08-31 96fcfee5c4f0632a9f43af11847708abee15c73f

1.0.5

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -58,10 +58,13 @@
    public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
                                                           @RequestParam(defaultValue = "10")Integer limit,
                                                           @RequestParam Map<String, Object> param){
        excludeTrash(param);
        ViewStayTimeBean bean = new ViewStayTimeBean();
        bean.setPageSize(limit);
        bean.setPageNumber(curr);
        bean.setLoc_no((String) param.get("loc_no"));
        List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);

        int count = reportQueryMapper.getViewStayTimeCount(bean);
        Page<ViewStayTimeBean> page = new Page<>();
        page.setRecords(list);

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

@@ -29,10 +29,12 @@

    @ApiModelProperty(value= "产品编码")
    @TableId(value = "mat_no", type = IdType.INPUT)
    @TableField("mat_no")
    private String matNo;

    @ApiModelProperty(value= "产品名称")
    @TableId(value = "mat_name")
    @TableField("mat_name")
    private String matName;

    @ApiModelProperty(value= "规格")

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

@@ -36,10 +36,12 @@

    @ApiModelProperty(value= "产品编码")
    @TableId(value = "mat_no")
    @TableField("mat_no")
    private String matNo;

    @ApiModelProperty(value= "产品名称")
    @TableId(value = "mat_name")
    @TableField("mat_name")
    private String matName;

    @ApiModelProperty(value= "规格")

 src/main/webapp/static/js/adjDetl/adjDetl.js

@@ -21,7 +21,7 @@
            // {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             {field: 'adjId', align: 'center',title: '序号'}
            {field: 'locNo$', align: 'center',title: '库位号'}
            {field: 'locNo$', align: 'center',title: '库位号',sort:true}
            ,{field: 'matNo$', align: 'center',title: '产品编号'}
            // ,{field: 'oriCtns', align: 'center',title: '原箱数'}
            ,{field: 'oriQty', align: 'center',title: '原数量'}

 src/main/webapp/static/js/cool.js

@@ -16,6 +16,7 @@
function autoShow(id) {
    var cac = document.getElementById(id).parentNode;
    var cacw = cac.getElementsByClassName("cool-auto-complete-window")[0];
    console.log(cacw)
    if (cacw.style.display === "none" || cacw.style.display === ""){
        cacw.style.display = "block";
        var cacwi = cacw.getElementsByClassName("cool-auto-complete-window-input")[0];

 src/main/webapp/static/js/matStore/matStore.js

@@ -160,7 +160,6 @@
            layer.msg("请输入数字");
        } else {
            if(count > (qty-inQty) ){
                count.html(59)
                layer.msg("入库数量不能超过可入库量");
            }
            if (count > 0) {

 src/main/webapp/static/js/report/stayTime.js

@@ -120,6 +120,14 @@
        pageCurr = 1;
        tableReload(false);
    });

    // 搜索栏重置事件
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

});

// 关闭动作
@@ -132,8 +140,9 @@
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });

    (child ? parent.tableIns : tableIns).reload({
        where: searchData,
        where:searchData,
        page: {
            curr: pageCurr
        },

 src/main/webapp/static/js/wrkDetl/wrkDetl.js

@@ -37,6 +37,7 @@
            pageSize: 'limit'
        },
        parseData: function (res) {
            console.log(res)
            return {
                'code': res.code,
                'msg': res.msg,
@@ -322,7 +323,7 @@
//            id: $('#id').val(),
            wrkNo: $('#wrkNo').val(),
            ioTime: top.strToDate($('#ioTime\\$').val()),
            matnr: $('#matnr').val(),
            matNo: $('#matNo').val(),
            lgnum: $('#lgnum').val(),
            tbnum: $('#tbnum').val(),
            tbpos: $('#tbpos').val(),

 src/main/webapp/views/adjDetl/adjDetl.html

@@ -30,11 +30,11 @@
            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>

 src/main/webapp/views/report/viewStayTime.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="id" placeholder="库位号" autocomplete="off">
            <input class="layui-input" type="text" name="loc_no" placeholder="库位号" autocomplete="off">
        </div>
    </div>


 src/main/webapp/views/staDesc/staDesc.html

@@ -25,6 +25,11 @@
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
             <input id="stnDesc" name="stn_desc" class="layui-input cool-auto-complete-div"  type="text" placeholder="站点名称" >
        </div>
    </div>
    <!--<div class="layui-inline">-->
        <!--<label class="layui-form-label">编　　号：</label>-->
        <!--<div class="layui-input-inline">-->