#

18516761980

2022-06-14 805ec040811664da13811030dd099908983ae848

#

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

@@ -123,7 +123,7 @@
    public R query(String condition) {
        EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
        wrapper.like("loc_desc", condition);
        Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 32), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasLocSts basLocSts : page.getRecords()){
            Map<String, Object> map = new HashMap<>();

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

@@ -123,7 +123,7 @@
    public R query(String condition) {
        EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
        wrapper.like("io_desc", condition);
        Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWrkIotype basWrkIotype : page.getRecords()){
            Map<String, Object> map = new HashMap<>();

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

@@ -123,7 +123,7 @@
    public R query(String condition) {
        EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
        wrapper.like("wrk_desc", condition);
        Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 20), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWrkStatus basWrkStatus : page.getRecords()){
            Map<String, Object> map = new HashMap<>();

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

@@ -180,6 +180,7 @@
                            break;
                        }
                    }
                    Date now =  new Date();
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocSts("O");
@@ -187,18 +188,18 @@
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    locMast.setLocType1(param.getLocType1());
                    locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                    locMast.setLocType2(param.getLocType2());
                    locMast.setLocType3(param.getLocType3());
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(new Date());
                    locMast.setAppeTime(now);
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    locMast.setModiTime(now);
                    list.add(locMast);
                }
            }
        }
        locMastService.delete(new EntityWrapper<>());
//        locMastService.delete(new EntityWrapper<>());
        locDetlService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok("初始化成功");

 src/main/webapp/static/js/locMast/locMast.js

@@ -15,6 +15,7 @@
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        // size: 'sm',
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[

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

@@ -64,6 +64,7 @@
        || html.trim()==='S'
        || html.trim()==='D'
        || html.trim()==='O'
        || html.trim()==='Z'
    ){

    } else {

 src/main/webapp/views/locMast/locMast.html

@@ -30,8 +30,19 @@
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="locSts" name="loc_sts" class="layui-input" type="text"  style="display: none">
            <input id="locSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="库位状态" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad2(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="loc_sts" placeholder="库位状态" autocomplete="off">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/resource/resource.html

@@ -161,7 +161,7 @@
                // ,{field: 'level$', align: 'center',title: '菜单等级'}
                ,{field: 'type', align: 'center',title: '类型', templet: '#typeTpl', width: 120}
                ,{field: 'sort', align: 'center',title: '排序'}

                ,{field: 'status$', align: 'center',title: '状态'}
                ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ]],
            done: function (data) {