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

luxiaotao1123

2022-06-07 53e8b479c720d5bd5c8d279c3fd6eacb7fa1603b

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

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

@@ -90,8 +90,15 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
                  @RequestParam Map<String, Object> param,
                  @RequestParam(required = false)Boolean unreason){
        if (unreason) {

            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
                    .where(" DATALENGTH( batch ) != 11 or\n" +
                            "            batch LIKE '%[a-z]%'")));
        }
        param.remove("unreason");
        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (param.get("row") != null) {

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

@@ -58,4 +58,7 @@


    Integer sum();

    List<LocDetl> unreason();

}

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -48,4 +48,7 @@


    Integer sum();

    List<LocDetl> unreason();

}

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -93,6 +93,11 @@
        return this.baseMapper.sum();
    }

    @Override
    public List<LocDetl> unreason() {
        return this.baseMapper.unreason();
    }


    @Override
    public LocDetl selectItem(String locNo, String matnr, String batch) {

 src/main/java/com/zy/asrs/task/TestScheduler.java

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.task;

import com.zy.asrs.task.handler.TestHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@Component
public class TestScheduler {
    @Autowired
    private TestHandler testHandler;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        testHandler.start();
    }

}

 src/main/java/com/zy/asrs/task/handler/TestHandler.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.task.handler;

import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import org.springframework.stereotype.Service;

import java.util.Date;

@Service
public class TestHandler extends AbstractHandler<String> {
    public ReturnT<String> start() {
        System.out.println("完成工作档" + new Date());
        return SUCCESS;
    }
}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -300,6 +300,15 @@
    <select id="sum" resultType="java.lang.Integer">
        SELECT SUM(anfme) FROM asr_loc_detl
    </select>
    <select id="unreason" resultType="com.zy.asrs.entity.LocDetl">
        SELECT
            *
        FROM
            [dbo].[asr_loc_detl]
        WHERE
            DATALENGTH( batch ) != 11 or
            batch LIKE '%[a-z]%'
    </select>


</mapper>

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -59,6 +59,9 @@
        url: baseUrl+'/locDetl/list/auth',
        page: true,
        limit: 20,
        where:{
          unreason: false
        },
        limits: [20, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
@@ -447,11 +450,35 @@
        tableReload(false);
    });


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

    //查看异常数据
    form.on('submit(unreason)', function (data) {
        pageCurr = 1;

        tableIns.reload({
            where: {
                unreason: true
            },
            page: {
                curr: pageCurr
            },
            done: function (res, curr, count) {

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

                limit(child);
            }
        });
    });

    // 时间选择器
@@ -473,7 +500,9 @@
});

function tableReload(child) {
    var searchData = {};
    var searchData = {
        unreason: false
    };
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });

 src/main/webapp/views/locDetl/locDetl.html

@@ -38,13 +38,16 @@
        <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>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
        <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">查看异常数据</button>
    </div>

</div>

<!-- 表格 -->