Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

luxiaotao1123

2022-06-08 f25907687dbba2ec816c2f9e8044959ca036ead4

Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

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

@@ -164,12 +164,24 @@
    public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
                                 @RequestParam(defaultValue = "10")Integer limit,
                                 @RequestParam Map<String, Object> param){
        List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
        Integer total = reportQueryMapper.selectWorkCountInTotal();
        String startTime = "1970.1.2";
        String endTime = "2099.1.2";
        if (!Cools.isEmpty(param.get("query_date"))) {
            String  queryDate = (String) param.get("query_date");
            String[] split = queryDate.split(" - ");
            startTime= split[0].split(" ")[0].replace("-",".");
            endTime = split[1].split(" ")[0].replace("-",".");
        }
        List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
        Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
        Page<ViewWorkCountInView> page = new Page<>();
        page.setRecords(allCountIn);
        page.setTotal(total);
        return R.ok(page);
        Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
        HashMap<String, Object> result = new HashMap<>();
        result.put("page",page);
        result.put("sum",sum);
        return R.ok(result);
    }

    /**
@@ -179,12 +191,24 @@
    public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
                                  @RequestParam(defaultValue = "10")Integer limit,
                                  @RequestParam Map<String, Object> param){
        List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
        Integer total = reportQueryMapper.selectWorkCountOutTotal();
        String startTime = "1970.1.2";
        String endTime = "2099.1.2";
        if (!Cools.isEmpty(param.get("query_date"))) {
            String  queryDate = (String) param.get("query_date");
            String[] split = queryDate.split(" - ");
            startTime= split[0].split(" ")[0].replace("-",".");
            endTime = split[1].split(" ")[0].replace("-",".");
        }
        List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
        Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
        Page<ViewWorkCountInView> page = new Page<>();
        page.setRecords(allCountIn);
        page.setTotal(total);
        return R.ok(page);
        Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
        HashMap<String, Object> result = new HashMap<>();
        result.put("page",page);
        result.put("sum",sum);
        return R.ok(result);
    }

    //excel导出

 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java

@@ -69,11 +69,15 @@
            + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
    public List<WorkChartAxis> getChartAxis();

    List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit);
    List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);

    Integer selectWorkCountInTotal();
    Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);

    List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize);
    List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);

    Integer selectWorkCountOutTotal();
    Integer selectWorkCountOutTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);

    Integer selectWorkCountInSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);

    Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
}

 src/main/resources/mapper/ViewInOutMapper.xml

@@ -61,5 +61,23 @@
    ]]>
</where>
</select>
    <select id="selectWorkCountInSum" resultType="java.lang.Integer">
        SELECT SUM(anfme) FROM asr_wrkin_count_view WHERE 1=1 AND
        (oneday > #{start}
        AND
        oneday &lt; #{end})
        <if test="matnr != null and matnr !=''">
            and matnr = #{matnr}
        </if>
    </select>
    <select id="selectWorkCountOutSum" resultType="java.lang.Integer">
        SELECT SUM(anfme) FROM asr_wrkout_count_view WHERE 1=1 AND
        (oneday > #{start}
        AND
        oneday &lt; #{end})
        <if test="matnr != null and matnr !=''">
            and matnr = #{matnr}
        </if>
    </select>

</mapper>

 src/main/resources/mapper/ViewStockUseMapper.xml

@@ -57,12 +57,30 @@
            ROW_NUMBER() OVER(Order by a.oneday desc) as row
        , *
        FROM(
        SELECT * FROM asr_wrkin_count_view) a ) b
        SELECT * FROM asr_wrkin_count_view
                 WHERE
                 1 = 1 AND
                 (oneday > #{start}
                 AND
                oneday &lt; #{end})

                 <if test="matnr != null and matnr !=''">
                     and matnr = #{matnr}
                 </if>

                ) a ) b
        WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})

    </select>
    <select id="selectWorkCountInTotal" resultType="java.lang.Integer">
        SELECT COUNT(*) FROM asr_wrkin_count_view
        WHERE 1= 1 AND
        (oneday > #{start}
        AND
        oneday &lt; #{end})
        <if test="matnr != null and matnr !='' ">
            and matnr = #{matnr}
        </if>
    </select>
    <select id="selectWorkCountOut" resultType="com.zy.asrs.entity.ViewWorkCountInView">
        SELECT *
@@ -71,11 +89,28 @@
                     ROW_NUMBER() OVER(Order by a.oneday desc) as row
        , *
                 FROM(
                         SELECT * FROM asr_wrkout_count_view) a ) b
                         SELECT * FROM asr_wrkout_count_view
        WHERE
        1 = 1 AND
        (oneday > #{start}
        AND
        oneday &lt; #{end})

        <if test="matnr != null and matnr !=''">
            and matnr = #{matnr}
        </if>
        ) a ) b
        WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
    </select>
    <select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
        SELECT COUNT(*) FROM asr_wrkout_count_view
        WHERE 1= 1 AND
        (oneday > #{start}
        AND
        oneday &lt; #{end})
        <if test="matnr != null and matnr !='' ">
            and matnr = #{matnr}
        </if>
    </select>

</mapper>

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

@@ -34,18 +34,19 @@
            limitName: 'pageSize'
        },
        parseData: function (res) {
            console.log(res);
            $('#countNum').text(res.data.sum + '个');
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
                'count': res.data.page.total,
                'data': res.data.page.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {

            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }

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

@@ -34,11 +34,12 @@
            limitName: 'pageSize'
        },
        parseData: function (res) {
            $('#countNum').text(res.data.sum + '个');
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
                'count': res.data.page.total,
                'data': res.data.page.records
            }
        },
        response: {

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

@@ -17,28 +17,30 @@
</head>
<body>

<!-- 搜索栏 -->
<!--<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="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>-->
<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">
        </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 class="layui-inline">
        <fieldset class="layui-elem-field">
            <legend>总计数量</legend>
            <div class="layui-field-box" id="countNum">
                请稍等
            </div>
        </fieldset>
    </div>
</div>

<!-- 表格 -->
<table class="layui-hide" id="workIn" lay-filter="workIn"></table>

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

@@ -18,27 +18,30 @@
<body>

<!-- 搜索栏 -->
<!--<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="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>-->
<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">
        </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 class="layui-inline">
        <fieldset class="layui-elem-field">
            <legend>总计数量</legend>
            <div class="layui-field-box" id="countNum">
                请稍等
            </div>
        </fieldset>
    </div>
</div>

<!-- 表格 -->
<table class="layui-hide" id="workOut" lay-filter="workOut"></table>