#

Junjie

2024-10-07 53873120bcc414acfaed4f7a499392c45f99c131

#

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java

@@ -42,6 +42,18 @@
        wrapper.eq("host_id",getHostId());
        wrapper.orderByDesc("io_pri");
        convert(param, wrapper);

        if (!Cools.isEmpty(condition)) {
            wrapper.and(item -> {
                item.like("wrk_no", condition)
                        .or().like("wrk_sts", condition)
                        .or().like("sta_no", condition)
                        .or().like("source_sta_no", condition)
                        .or().like("loc_no", condition)
                        .or().like("source_loc_no", condition);
            });
        }

        return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){

 zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html

@@ -71,7 +71,7 @@
    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">