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

luxiaotao1123

2022-06-15 f6c078d34a597fb709273440374f0c85823f1be5

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

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

@@ -92,7 +92,7 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param,
                  @RequestParam(required = false)Boolean unreason){
        if (unreason) {
        if (!Cools.isEmpty(unreason) && unreason) {

            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
                    .where(" DATALENGTH( batch ) != 11 or\n" +

 src/main/resources/mapper/ViewInOutMapper.xml

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

 src/main/resources/mapper/ViewStockUseMapper.xml

@@ -60,7 +60,7 @@
        SELECT * FROM asr_wrkin_count_view
                 WHERE
                 1 = 1 AND
                 (oneday > #{start}
                 (oneday >= #{start}
                 AND
                oneday &lt; #{end})

@@ -75,7 +75,7 @@
    <select id="selectWorkCountInTotal" resultType="java.lang.Integer">
        SELECT COUNT(*) FROM asr_wrkin_count_view
        WHERE 1= 1 AND
        (oneday > #{start}
        (oneday >= #{start}
        AND
        oneday &lt; #{end})
        <if test="matnr != null and matnr !='' ">