*

lsh

11 小时以前 91cfc50d5231ffa6e1e9a86e12bd68f3efa57e50

*

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

@@ -61,14 +61,14 @@
    }

    @RequestMapping(value = "/basArm/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "新增机械臂相关配置")
    public R add(BasArm basArm) {
        basArmService.insert(basArm);
        return R.ok();
    }

    @RequestMapping(value = "/basArm/update/auth")
    @ManagerAuth
    @ManagerAuth(memo = "修改机械臂相关配置")
    public R update(BasArm basArm){
        if (Cools.isEmpty(basArm) || null==basArm.getId()){
            return R.error();
@@ -78,7 +78,7 @@
    }

    @RequestMapping(value = "/basArm/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除机械臂相关配置")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            basArmService.deleteById(id);
@@ -87,7 +87,7 @@
    }

    @RequestMapping(value = "/basArm/export/auth")
    @ManagerAuth
    @ManagerAuth(memo = "导出机械臂相关配置")
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasArm> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);

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

@@ -57,7 +57,7 @@
    }

    @RequestMapping(value = "/inventoryFlow/list/auth")
    @ManagerAuth(memo = "库存移动流水记录")
//    @ManagerAuth(memo = "库存移动流水记录")
    public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,

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

@@ -30,6 +30,21 @@
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <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="request" placeholder="请求数据" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="response" placeholder="返回数据" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
@@ -47,8 +62,8 @@
<table class="layui-hide" id="operateLog" lay-filter="operateLog"></table>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
        <!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">导出</button>
    </div>
</script>