#

Junjie

2023-12-28 4f37250d96659eb386f1c22dae3a76ec27ef35f1

#

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

@@ -44,6 +44,12 @@
            wrapper.ge(StaDesc::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(StaDesc::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("device_no"))) {
            wrapper.eq(StaDesc::getDeviceNo, param.get("device_no"));
        }
        if (!Cools.isEmpty(param.get("device_stn"))) {
            wrapper.eq(StaDesc::getDeviceStn, param.get("device_stn"));
        }
        return R.ok(staDescService.page(new Page<>(curr, limit), wrapper));
    }


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

@@ -32,12 +32,12 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="设备号" autocomplete="off">
            <input class="layui-input" type="text" name="device_no" placeholder="设备号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_stn" placeholder="设备站点" autocomplete="off">
            <input class="layui-input" type="text" name="device_stn" placeholder="设备站点" autocomplete="off">
        </div>
    </div>
    <!--<div class="layui-inline">-->