#

LSH

2023-10-23 6c710d40df8e3b1af295f05165ba021328a74112

#

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

@@ -68,16 +68,25 @@
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        boolean sign = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
            } else if (entry.getKey().equals("loc_no")){
                wrapper.like(entry.getKey(), val);
            } else {
                if (entry.getKey().equals("loc_type1")){
                    sign=true;
                }
                wrapper.eq(entry.getKey(), val);
            }
        }
        if (sign){
            wrapper.and().ne("loc_sts","Y");
        }
    }

    @RequestMapping(value = "/locMast/add/auth")

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

@@ -54,7 +54,7 @@
            // ,{field: 'barcode', align: 'center',title: ''}
            // ,{field: 'PdcType', align: 'center',title: ''}
            // ,{field: 'ctnNo', align: 'center',title: ''}
            ,{field: 'locType1$', align: 'center',title: '高低类型'}
            ,{field: 'locType1$', align: 'center',title: '大小类型'}
            // ,{field: 'locType2$', align: 'center',title: '宽窄类型'}
            // ,{field: 'locType3$', align: 'center',title: '轻重类型'}


 src/main/webapp/static/js/stoMan/stoQue.js

@@ -40,6 +40,7 @@
                    return html;
                },width:80}
            ,{field: 'barcode', align: 'center',title: '条码号'}
            ,{field: 'locType1$', align: 'center',title: '大小类型'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', width: 180}
            ,{ fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}

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

@@ -42,6 +42,16 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="库位类型" autocomplete="off">
                <!--                    <option style="display: none"></option>-->
                <option value=""></option>
                <option value="1">小库位</option>
                <option value="2">大库位</option>
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        </div>
    </div>

 src/main/webapp/views/stoMan/stoQue.html

@@ -45,6 +45,16 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="库位类型" autocomplete="off">
                <!--                    <option style="display: none"></option>-->
                <option value=""></option>
                <option value="1">小库位</option>
                <option value="2">大库位</option>
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        </div>
    </div>