*

lsh

昨天 3d00d9dd9b444c152b08b48fde0b4dd6a0dfa4b2

*

 src/main/java/basArmMastSign.sql

@@ -9,10 +9,29 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-export', '导出', '', '3', '4', '1');

-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign/basArmMastSign.html', N'basArmMastSign管理', null, '2', null, '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign/basArmMastSign.html', N'下发分拣线数据', '221', '2', '12', '1');

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

-- sqlserver2
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast/basArmMast.html', N'机械臂任务管理', '221', '2', '10', '1');

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

-- sqlserver2
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastLog/basArmMastLog.html', N'机械臂任务历史', '221', '2', '11', '1');

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


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

@@ -43,6 +43,7 @@
        convert(param, wrapper);
        allLike(BasArmMast.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time",false);
        return R.ok(basArmMastService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -43,6 +43,7 @@
        convert(param, wrapper);
        allLike(BasArmMastLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time",false);
        return R.ok(basArmMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -70,16 +70,16 @@
    @ApiModelProperty(value= "状态")
    private Integer status;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "matnr")
    private String matnr;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "po")
    private String po;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "upc")
    private String upc;

    /**
@@ -88,7 +88,7 @@
    @ApiModelProperty(value= "货源")
    private String supplier;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "订单号")
    @TableField("order_no")
    private String orderNo;

@@ -180,4 +180,25 @@
//    );


    public String getStatus$() {
        if (Cools.isEmpty(status)) {return "未知异常";}
        switch (status){
            case 0:
                return "0.等待下发至机械臂";
            case 1:
                return "1.机械臂作业中";
            case 2:
                return "2.单码完成等待托盘完成";
            case 3:
                return "3.自动组托中";
            case 4:
                return "4.自动组托成功";
            case 5:
                return "5.等待机械臂订单完成";
            case 6:
                return "6.完结";
            default:
                return "未知异常";
        }
    }
}

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

@@ -188,4 +188,25 @@
//    );


    public String getStatus$() {
        if (Cools.isEmpty(status)) {return "未知异常";}
        switch (status){
            case 0:
                return "0.等待下发至机械臂";
            case 1:
                return "1.机械臂作业中";
            case 2:
                return "2.单码完成等待托盘完成";
            case 3:
                return "3.自动组托中";
            case 4:
                return "4.自动组托成功";
            case 5:
                return "5.等待机械臂订单完成";
            case 6:
                return "6.完结";
            default:
                return "未知异常";
        }
    }
}

 src/main/webapp/static/js/basArmMast/basArmMast.js

@@ -21,25 +21,27 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'armNo', align: 'center',title: '机械臂编号'}
            ,{field: 'armDirection', align: 'center',title: '操作方向'}
            ,{field: 'staNo', align: 'center',title: '终点'}
            ,{field: 'sortingLine', align: 'center',title: '起点'}
            ,{field: 'bindingTags', align: 'center',title: '绑定标记'}
            ,{field: 'priority', align: 'center',title: '优先级'}
            ,{field: 'status', align: 'center',title: '状态'}
            ,{field: 'matnr', align: 'center',title: ''}
            ,{field: 'sku', align: 'center',title: ''}
            ,{field: 'po', align: 'center',title: ''}
            ,{field: 'upc', align: 'center',title: ''}
            ,{field: 'supplier', align: 'center',title: '货源'}
            ,{field: 'orderNo', align: 'center',title: ''}
            ,{field: 'ctns', align: 'center',title: '箱数'}
            ,{field: 'createTime', align: 'center',title: '时间戳'}
            ,{field: 'armError', align: 'center',title: '异常代码'}
            ,{field: 'armMsg', align: 'center',title: '异常信息'}
            // {type: 'checkbox'}
            // ,
            {field: 'id', align: 'center',title: 'ID',hide: true}
            ,{field: 'armNo', align: 'center',title: '机械臂编号',hide: false}
            ,{field: 'orderNo', align: 'center',title: '订单号',hide: false}
            ,{field: 'armDirection', align: 'center',title: '操作方向',hide: true}
            ,{field: 'staNo', align: 'center',title: '终点',hide: false}
            ,{field: 'sortingLine', align: 'center',title: '起点',hide: false}
            ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
            ,{field: 'sku', align: 'center',title: 'sku',hide: true}
            ,{field: 'po', align: 'center',title: 'po',hide: false}
            ,{field: 'upc', align: 'center',title: 'upc',hide: false}
            ,{field: 'status', align: 'center',title: '作业状态',hide: true}
            ,{field: 'status$', align: 'center',title: '作业状态',hide: false}
            ,{field: 'bindingTags', align: 'center',title: '分拣绑定标记',hide: false}
            ,{field: 'priority', align: 'center',title: '优先级',hide: true}
            ,{field: 'supplier', align: 'center',title: '货源',hide: false}
            ,{field: 'ctns', align: 'center',title: '箱数',hide: true}
            ,{field: 'createTime', align: 'center',title: '时间戳',hide: true}
            ,{field: 'armError', align: 'center',title: '异常代码',hide: true}
            ,{field: 'armMsg', align: 'center',title: '异常信息',hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/static/js/basArmMastLog/basArmMastLog.js

@@ -21,25 +21,27 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'armNo', align: 'center',title: '机械臂编号'}
            ,{field: 'armDirection', align: 'center',title: '操作方向'}
            ,{field: 'staNo', align: 'center',title: '终点'}
            ,{field: 'sortingLine', align: 'center',title: '起点'}
            ,{field: 'bindingTags', align: 'center',title: '绑定标记'}
            ,{field: 'priority', align: 'center',title: '优先级'}
            ,{field: 'status', align: 'center',title: '状态'}
            ,{field: 'matnr', align: 'center',title: ''}
            ,{field: 'sku', align: 'center',title: ''}
            ,{field: 'po', align: 'center',title: ''}
            ,{field: 'upc', align: 'center',title: ''}
            ,{field: 'supplier', align: 'center',title: '货源'}
            ,{field: 'orderNo', align: 'center',title: ''}
            ,{field: 'ctns', align: 'center',title: '箱数'}
            ,{field: 'createTime', align: 'center',title: '时间戳'}
            ,{field: 'armError', align: 'center',title: '异常代码'}
            ,{field: 'armMsg', align: 'center',title: '异常信息'}
            // {type: 'checkbox'}
            // ,
            {field: 'id', align: 'center',title: 'ID',hide: true}
            ,{field: 'armNo', align: 'center',title: '机械臂编号',hide: false}
            ,{field: 'orderNo', align: 'center',title: '订单号',hide: false}
            ,{field: 'armDirection', align: 'center',title: '操作方向',hide: true}
            ,{field: 'staNo', align: 'center',title: '终点',hide: false}
            ,{field: 'sortingLine', align: 'center',title: '起点',hide: false}
            ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
            ,{field: 'sku', align: 'center',title: 'sku',hide: true}
            ,{field: 'po', align: 'center',title: 'po',hide: false}
            ,{field: 'upc', align: 'center',title: 'upc',hide: false}
            ,{field: 'status', align: 'center',title: '状态',hide: true}
            ,{field: 'status$', align: 'center',title: '状态',hide: false}
            ,{field: 'bindingTags', align: 'center',title: '分拣绑定标记',hide: false}
            ,{field: 'priority', align: 'center',title: '优先级',hide: true}
            ,{field: 'supplier', align: 'center',title: '货源',hide: false}
            ,{field: 'ctns', align: 'center',title: '箱数',hide: true}
            ,{field: 'createTime', align: 'center',title: '时间戳',hide: true}
            ,{field: 'armError', align: 'center',title: '异常代码',hide: true}
            ,{field: 'armMsg', align: 'center',title: '异常信息',hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/basArmMast/basArmMast.html

@@ -17,21 +17,76 @@
        <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">
                        <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">
                            <input class="layui-input" type="text" name="arm_no" 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="order_no" placeholder="订单号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sta_no" placeholder="终点、码垛位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sorting_line" placeholder="起点、拆垛位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="status" id="status" class="layui-input" type="text" placeholder="作业状态" autocomplete="off">
<!--                                <option style="display: none"></option>-->
                                <option value="">作业状态</option>
                                <option value="0">0.等待下发至机械臂</option>
                                <option value="1">1.机械臂作业中</option>
                                <option value="2">2.单码完成等待托盘完成</option>
                                <option value="3">3.自动组托中</option>
                                <option value="4">4.自动组托成功</option>
                                <option value="5">5.等待机械臂完成订单</option>
                                <option value="6">6.完结</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="upc" placeholder="upc" 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="binding_tags" 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">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
@@ -72,96 +127,112 @@
        <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">机械臂编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="armNo" placeholder="请输入机械臂编号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">操作方向: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="armDirection" placeholder="请输入操作方向" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">终点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="staNo" placeholder="请输入终点" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">起点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sortingLine" placeholder="请输入起点" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">机械臂编号: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="armNo" placeholder="请输入机械臂编号" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">操作方向: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="armDirection" placeholder="请输入操作方向" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">终点: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="staNo" placeholder="请输入终点" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">起点: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="sortingLine" placeholder="请输入起点" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">绑定标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bindingTags" placeholder="请输入绑定标记" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="bindingTags" placeholder="请输入分拣绑定标记" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">优先级: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="priority" placeholder="请输入优先级" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">状态: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="status" placeholder="请输入状态" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->

                <!-- 工作状态 -->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">优先级: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="priority" placeholder="请输入优先级" lay-vertype="tips" lay-verify="required">
                    <label class="layui-form-label layui-form-required">状态：</label>
                    <div class="layui-input-inline">
                        <select name="status">
                            <option value="0">0.等待下发至机械臂</option>
                            <option value="1">1.机械臂作业中</option>
                            <option value="2">2.单码完成等待托盘完成</option>
                            <option value="3">3.自动组托中</option>
                            <option value="4">4.自动组托成功</option>
                            <option value="5">5.等待机械臂完成订单</option>
                            <option value="6">6.完结</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">状态: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="status" placeholder="请输入状态" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sku" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="po" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="upc" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="matnr" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="sku" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="po" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="upc" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">货源: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="supplier" placeholder="请输入货源" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="orderNo" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">箱数: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ctns" placeholder="请输入箱数" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">时间戳: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" placeholder="请输入时间戳" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="orderNo" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">箱数: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="ctns" placeholder="请输入箱数" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">时间戳: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="createTime" placeholder="请输入时间戳" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">异常代码: </label>
                    <div class="layui-input-block">

 src/main/webapp/views/basArmMastLog/basArmMastLog.html

@@ -22,14 +22,64 @@
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                            <input class="layui-input" type="text" name="arm_no" 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="order_no" placeholder="订单号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sta_no" placeholder="终点、码垛位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sorting_line" placeholder="起点、拆垛位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="status" id="status" class="layui-input" type="text" placeholder="作业状态" autocomplete="off">
                                <!--                                <option style="display: none"></option>-->
                                <option value="">作业状态</option>
                                <option value="0">0.等待下发至机械臂</option>
                                <option value="1">1.机械臂作业中</option>
                                <option value="2">2.单码完成等待托盘完成</option>
                                <option value="3">3.自动组托中</option>
                                <option value="4">4.自动组托成功</option>
                                <option value="5">5.等待机械臂完成订单</option>
                                <option value="6">6.完结</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="upc" placeholder="upc" 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="binding_tags" placeholder="分拣绑定标记" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -49,15 +99,15 @@

<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-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>
<!--    <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>