#agv转历史档

lty

1 天以前 d273bcbfb660a4872b8e41b8b4e53607f130f1bc

#agv转历史档

 src/main/java/basAgvMastLog.sql

New file
@@ -0,0 +1,18 @@
-- save basAgvMastLog record
-- mysql
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog/basAgvMastLog.html', 'basAgvMastLog管理', null , '2', null , '1');

insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#view', '查询', '', '3', '0', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-add', '新增', '', '3', '1', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-edit', '编辑', '', '3', '2', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-delete', '删除', '', '3', '3', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-export', '导出', '', '3', '4', '1');

-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog/basAgvMastLog.html', N'basAgvMastLog管理', null, '2', null, '1');

insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#view', N'查询', '', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-add', N'新增', '', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-edit', N'编辑', '', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-delete', N'删除', '', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-export', N'导出', '', '3', '4', '1');

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

New file
@@ -0,0 +1,125 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasAgvMastLog;
import com.zy.asrs.service.BasAgvMastLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class BasAgvMastLogController extends BaseController {

    @Autowired
    private BasAgvMastLogService basAgvMastLogService;

    @RequestMapping(value = "/basAgvMastLog/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basAgvMastLogService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basAgvMastLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasAgvMastLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basAgvMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        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 {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/basAgvMastLog/add/auth")
    @ManagerAuth
    public R add(BasAgvMastLog basAgvMastLog) {
        basAgvMastLogService.insert(basAgvMastLog);
        return R.ok();
    }

    @RequestMapping(value = "/basAgvMastLog/update/auth")
    @ManagerAuth
    public R update(BasAgvMastLog basAgvMastLog){
        if (Cools.isEmpty(basAgvMastLog) || null==basAgvMastLog.getId()){
            return R.error();
        }
        basAgvMastLogService.updateById(basAgvMastLog);
        return R.ok();
    }

    @RequestMapping(value = "/basAgvMastLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            basAgvMastLogService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/basAgvMastLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvMastLog"));
        convert(map, wrapper);
        List<BasAgvMastLog> list = basAgvMastLogService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basAgvMastLogQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<BasAgvMastLog> page = basAgvMastLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasAgvMastLog basAgvMastLog : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basAgvMastLog.getId());
            map.put("value", basAgvMastLog.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/basAgvMastLog/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasAgvMastLog> wrapper = new EntityWrapper<BasAgvMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basAgvMastLogService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasAgvMastLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

 src/main/java/com/zy/asrs/entity/BasAgvMastLog.java

New file
@@ -0,0 +1,242 @@
package com.zy.asrs.entity;

import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("asr_bas_agv_mast_log")
public class BasAgvMastLog implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    private Long id;

    /**
     * WMS任务号
     */
    @ApiModelProperty(value= "WMS任务号")
    @TableId(value = "task_no", type = IdType.INPUT)
    @TableField("task_no")
    private Integer taskNo;

    /**
     * RGV任务号
     */
    @ApiModelProperty(value= "RGV任务号")
    private Long timestamp;

    /**
     * 源站点
     */
    @ApiModelProperty(value= "源站点")
    @TableField("source_sta_no")
    private Integer sourceStaNo;

    /**
     * 目的站点
     */
    @ApiModelProperty(value= "目的站点")
    @TableField("sta_no")
    private Integer staNo;

    /**
     * 源库位
     */
    @ApiModelProperty(value= "源库位")
    @TableField("source_loc_no")
    private String sourceLocNo;

    /**
     * 目的库位
     */
    @ApiModelProperty(value= "目的库位")
    @TableField("loc_no")
    private String locNo;

    /**
     * 优先级
     */
    @ApiModelProperty(value= "优先级")
    private Long priority;

    /**
     * 楼层
     */
    @ApiModelProperty(value= "楼层")
    @TableField("floor_no")
    private Integer floorNo;

    /**
     * 状态 0: 初始  1: 作业中  2: 完成  
     */
    @ApiModelProperty(value= "状态 0: 初始  1: 作业中  2: 完成  ")
    private Integer status;

    /**
     * 异常时间
     */
    @ApiModelProperty(value= "异常时间")
    @TableField("error_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date errorTime;

    /**
     * 异常信息
     */
    @ApiModelProperty(value= "异常信息")
    @TableField("error_memo")
    private String errorMemo;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("modi_user")
    private String modiUser;

    @ApiModelProperty(value= "")
    @TableField("devp_id")
    private Integer devpId;

    @ApiModelProperty(value= "")
    @TableField("io_type")
    private Integer ioType;

    public BasAgvMastLog() {}

    public BasAgvMastLog(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser,Integer devpId,Integer ioType) {
        this.taskNo = taskNo;
        this.timestamp = timestamp;
        this.sourceStaNo = sourceStaNo;
        this.staNo = staNo;
        this.sourceLocNo = sourceLocNo;
        this.locNo = locNo;
        this.priority = priority;
        this.floorNo = floorNo;
        this.status = status;
        this.errorTime = errorTime;
        this.errorMemo = errorMemo;
        this.appeTime = appeTime;
        this.modiTime = modiTime;
        this.modiUser = modiUser;
        this.devpId = devpId;
        this.ioType = ioType;
    }

    public BasAgvMastLog(BasAgvMast basAgvMast) {
        if (basAgvMast != null) {
            this.taskNo = basAgvMast.getTaskNo();
            this.timestamp = basAgvMast.getTimestamp();
            this.sourceStaNo = basAgvMast.getSourceStaNo();
            this.staNo = basAgvMast.getStaNo();
            this.sourceLocNo = basAgvMast.getSourceLocNo();
            this.locNo = basAgvMast.getLocNo();
            this.priority = basAgvMast.getPriority();
            this.floorNo = basAgvMast.getFloorNo();
            this.status = basAgvMast.getStatus();
            this.appeTime = new Date();
            this.ioType = basAgvMast.getIoType();
        }
    }

//    BasAgvMastLog basAgvMastLog = new BasAgvMastLog(
//            null,    // WMS任务号[非空]
//            null,    // RGV任务号
//            null,    // 源站点
//            null,    // 目的站点
//            null,    // 源库位
//            null,    // 目的库位
//            null,    // 优先级
//            null,    // 楼层
//            null,    // 状态
//            null,    // 异常时间
//            null,    // 异常信息
//            null,    // 添加时间
//            null,    // 修改时间
//            null,    // 修改人员
//            null,    // 
//            null    // 
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "初始";
            case 1:
                return "作业中";
            case 2:
                return "完成";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getErrorTime$(){
        if (Cools.isEmpty(this.errorTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
    }

    public String getAppeTime$(){
        if (Cools.isEmpty(this.appeTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }


}

 src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.BasAgvMastLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface BasAgvMastLogMapper extends BaseMapper<BasAgvMastLog> {

}

 src/main/java/com/zy/asrs/service/BasAgvMastLogService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.BasAgvMastLog;
import com.baomidou.mybatisplus.service.IService;

public interface BasAgvMastLogService extends IService<BasAgvMastLog> {

}

 src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.BasAgvMastLogMapper;
import com.zy.asrs.entity.BasAgvMastLog;
import com.zy.asrs.service.BasAgvMastLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("basAgvMastLogService")
public class BasAgvMastLogServiceImpl extends ServiceImpl<BasAgvMastLogMapper, BasAgvMastLog> implements BasAgvMastLogService {

}

 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -2,8 +2,10 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasAgvMastService;
import com.zy.asrs.service.BasArmMastLogService;
import com.zy.asrs.service.BasArmMastService;
import com.zy.asrs.service.WrkMastService;
@@ -29,6 +31,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private BasArmMastService basArmMastService;
    @Autowired
    private BasAgvMastService basAgvMastService;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
@@ -68,14 +72,14 @@

    @Scheduled(cron = "0/10 * * * * ? ")
    private void executeAgv(){
        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
        if (basArmMastList.isEmpty()) {
        List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 3));
        if (basAgvstList.isEmpty()) {
            return;
        }
        for (BasArmMast basArmMast : basArmMastList) {
            ReturnT<String> result = workLogHandler.startArm(basArmMast);
        for (BasAgvMast basAgvMast : basAgvstList) {
            ReturnT<String> result = workLogHandler.startAgv(basAgvMast);
            if (!result.isSuccess()) {
                log.error("ARM工作档[id={}]历史档处理失败", basArmMast.getId());
                log.error("AGV工作档[id={}]历史档处理失败", basAgvMast.getId());
            }
        }
    }

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -40,8 +40,11 @@
    @Autowired
    private BasArmMastLogService basArmMastLogService;
    @Autowired
    private BasAgvMastLogService basAgvMastLogService;
    @Autowired
    private BasArmMastService basArmMastService;

    @Autowired
    private BasAgvMastService basAgvMastService;
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
@@ -148,4 +151,25 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
        try {
            BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
            // 保存工作主档历史档
            if (!basAgvMastLogService.insert(basAgvMastLog)) {
                exceptionHandle("保存ARM工作历史档[id={0}]失败", basAgvMast.getId());
            }
            // 删除工作主档
            if (!basAgvMastService.deleteById(basAgvMast)) {
                exceptionHandle("删除ARM工作主档[id={0}]失败", basAgvMast.getId());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

}

 src/main/java/com/zy/common/CodeBuilder.java

@@ -20,7 +20,7 @@
        generator.url="10.10.10.235:1433;databasename=jshdasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="asr_bas_agv_loc_no";
        generator.table="asr_bas_agv_mast_log";
        generator.packagePath="com.zy.asrs";
        generator.build();
    }

 src/main/resources/mapper/BasAgvMastLogMapper.xml

New file
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.BasAgvMastLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvMastLog">
        <id column="id" property="id" />
        <result column="task_no" property="taskNo" />
        <result column="timestamp" property="timestamp" />
        <result column="source_sta_no" property="sourceStaNo" />
        <result column="sta_no" property="staNo" />
        <result column="source_loc_no" property="sourceLocNo" />
        <result column="loc_no" property="locNo" />
        <result column="priority" property="priority" />
        <result column="floor_no" property="floorNo" />
        <result column="status" property="status" />
        <result column="error_time" property="errorTime" />
        <result column="error_memo" property="errorMemo" />
        <result column="appe_time" property="appeTime" />
        <result column="modi_time" property="modiTime" />
        <result column="modi_user" property="modiUser" />
        <result column="devp_id" property="devpId" />
        <result column="io_type" property="ioType" />

    </resultMap>

</mapper>

 src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js

New file
@@ -0,0 +1,276 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#basAgvMastLog',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/basAgvMastLog/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'taskNo', align: 'center',title: 'WMS任务号'}
            ,{field: 'timestamp', align: 'center',title: 'RGV任务号'}
            ,{field: 'sourceStaNo', align: 'center',title: '源站点'}
            ,{field: 'staNo', align: 'center',title: '目的站点'}
            ,{field: 'sourceLocNo', align: 'center',title: '源库位'}
            ,{field: 'locNo', align: 'center',title: '目的库位'}
            ,{field: 'priority', align: 'center',title: '优先级'}
            ,{field: 'floorNo', align: 'center',title: '楼层'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'errorTime$', align: 'center',title: '异常时间'}
            ,{field: 'errorMemo', align: 'center',title: '异常信息'}
            ,{field: 'appeTime$', align: 'center',title: '添加时间'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'devpId', align: 'center',title: ''}
            ,{field: 'ioType', align: 'center',title: ''}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(basAgvMastLog)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(basAgvMastLog)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'basAgvMastLog': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/basAgvMastLog/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(basAgvMastLog)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/basAgvMastLog/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/basAgvMastLog/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '.layui-laydate-range'
                ,type: 'datetime'
                ,range: true
            });
            layDate.render({
                elem: '#errorTime\\$',
                type: 'datetime',
                value: data!==undefined?data['errorTime\\$']:null
            });
            layDate.render({
                elem: '#appeTime\\$',
                type: 'datetime',
                value: data!==undefined?data['appeTime\\$']:null
            });
            layDate.render({
                elem: '#modiTime\\$',
                type: 'datetime',
                value: data!==undefined?data['modiTime\\$']:null
            });

        }, 300);
    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/views/basAgvMastLog/basAgvMastLog.html

New file
@@ -0,0 +1,193 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>

<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <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 class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="basAgvMastLog" lay-filter="basAgvMastLog"></table>
        </div>
    </div>
</div>

<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 layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basAgvMastLog/basAgvMastLog.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">WMS任务号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="taskNo" placeholder="请输入WMS任务号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">RGV任务号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="timestamp" placeholder="请输入RGV任务号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源站点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sourceStaNo" placeholder="请输入源站点">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">目的站点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="staNo" placeholder="请输入目的站点">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源库位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sourceLocNo" placeholder="请输入源库位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">目的库位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="locNo" placeholder="请输入目的库位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">优先级: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="priority" placeholder="请输入优先级">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">楼层: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="floorNo" placeholder="请输入楼层">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="0">初始</option>
                            <option value="1">作业中</option>
                            <option value="2">完成</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="errorTime" id="errorTime$" placeholder="请输入异常时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常信息: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="errorMemo" placeholder="请输入异常信息">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="modiTime" id="modiTime$" placeholder="请输入修改时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="modiUser" placeholder="请输入修改人员" style="display: none">
                        <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入修改人员" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="devpId" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ioType" placeholder="请输入">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>