优化库位规则查找，调整操作日志搜索框

zhangc

2025-01-21 3933218eaa7a68d44e972b753239b38a951bc351

优化库位规则查找，调整操作日志搜索框

 src/main/java/com/zy/common/service/AgvCommonService.java

@@ -141,10 +141,10 @@
        throw new CoolException(floor + "楼；该楼层没有空库位");
    }

    /*
    库位规则查找
    /**
     * 库位规则查找
     */
    public AgvLocMast getLocByLocRule(int type, int floor, String factory) {
    public AgvLocMast getLocByLocRule(int type, int floor,  String factory) {

        try {
            EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();

 src/main/webapp/views/operateLog/operateLog.html

@@ -16,14 +16,15 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="action" placeholder="操作内容" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
            <input class="layui-input" type="text" name="request" placeholder="请求数据" autocomplete="off">
        </div>
    </div>

    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="userId" class="layui-input" name="user_id" type="text" placeholder="请输入" autocomplete="off" style="display: none">
@@ -41,6 +42,11 @@
            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <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">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>