#当前本版十分完美、冻结

luxiaotao1123

2020-07-29 03e5ff030c6883df3daec952b7bc9af13ecd130c

#当前本版十分完美、冻结

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

@@ -161,12 +161,7 @@

    //------------------日出库明细统计--------------------------------------
    @RequestMapping("/viewWorkOutList.action")
    public R viewWorkOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        ViewWorkInBean bean = new ViewWorkInBean();
        bean.setPageSize(limit);
        bean.setPageNumber(curr);
    public R viewWorkOutList(ViewWorkInBean bean){
        List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
        int count = reportQueryMapper.getViewWorkOutCount(bean);
        Page<ViewWorkInBean> page = new Page<>();

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

@@ -61,6 +61,7 @@
    private double wt;            //重量
    private int pageNumber;
    private int pageSize;
    private String query_date;
    private String begin_date; //查询开始日期
    private String end_date;   //查询截止日期
    private double num1;
@@ -404,5 +405,14 @@
    public void setCrn_end_time(String crn_end_time) {
        this.crn_end_time = crn_end_time;
    }
    

    public void setQuery_date(String query_date) {
        this.query_date = query_date;
        if (query_date.contains(" - ")) {
            String[] dates = query_date.split(" - ");
            this.begin_date = dates[0];
            this.end_date = dates[1];

        }
    }
}

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

@@ -30,8 +30,8 @@
        cellMinWidth: 50,
        cols: [getCol()],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
            pageName: 'pageNumber',
            limitName: 'pageSize'
        },
        parseData: function (res) {
            return {
@@ -121,6 +121,19 @@
        pageCurr = 1;
        tableReload(false);
    });

    // 搜索栏重置事件
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });
    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
    });

});

// 关闭动作

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

@@ -19,18 +19,25 @@

<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <!--<div class="layui-inline">-->
        <!--<label class="layui-form-label">库 位 号：</label>-->
        <!--<div class="layui-input-inline">-->
            <!--<input class="layui-input" type="text" name="id" placeholder="请输入" autocomplete="off">-->
        <!--</div>-->
    <!--</div>-->

    <!-- 待添加 -->
<!--    <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
<!--        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>-->
<!--        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="loc_no" 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">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
</div>

<!-- 表格 -->