#

yxFwq

2025-01-14 d9bd47abe7980a861186187481c6bd0af72159dc

#

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

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


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

@@ -364,31 +364,31 @@
        if (null == this.ioType){ return "未知"; }
        switch (this.ioType){
            case 0:
                return "未知";
                return "0.未知";
            case 1:
                return "开进料门";
                return "1.开进料门";
            case 2:
                return "关进料门";
                return "2.关进料门";
            case 3:
                return "开出料门";
                return "3.开出料门";
            case 4:
                return "关出料门";
                return "4.关出料门";
            case 5:
                return "入硫化罐";
                return "5.入硫化罐";
            case 6:
                return "入冷却槽";
                return "6.入冷却槽";
            case 7:
                return "B=>C";
                return "7.B=>C";
            case 8:
                return "C=>B";
                return "8.C=>B";
            case 9:
                return "出冷却槽";
                return "9.出冷却槽";
            case 10:
                return "A=>B";
                return "10.A=>B";
            case 11:
                return "B=>A";
                return "11.B=>A";
            case 100:
                return "充电任务";
                return "100.充电任务";
            default:
                return String.valueOf(this.ioType);
        }

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

@@ -397,31 +397,31 @@
        if (null == this.ioType){ return "未知"; }
        switch (this.ioType){
            case 0:
                return "未知";
                return "0.未知";
            case 1:
                return "开进料门";
                return "1.开进料门";
            case 2:
                return "关进料门";
                return "2.关进料门";
            case 3:
                return "开出料门";
                return "3.开出料门";
            case 4:
                return "关出料门";
                return "4.关出料门";
            case 5:
                return "入硫化罐";
                return "5.入硫化罐";
            case 6:
                return "入冷却槽";
                return "6.入冷却槽";
            case 7:
                return "B=>C";
                return "7.B=>C";
            case 8:
                return "C=>B";
                return "8.C=>B";
            case 9:
                return "出冷却槽";
                return "9.出冷却槽";
            case 10:
                return "A=>B";
                return "10.A=>B";
            case 11:
                return "B=>A";
                return "11.B=>A";
            case 100:
                return "充电任务";
                return "100.充电任务";
            default:
                return String.valueOf(this.ioType);
        }

 src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js

@@ -21,8 +21,8 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID', hide: true}
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID', hide: true}
            ,{field: 'wrkNo', align: 'center',title: '工作号', hide: false}
            ,{field: 'wrkType$', align: 'center',title: '任务状态', hide: false}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', hide: false}
@@ -38,8 +38,8 @@
            ,{field: 'rgvId', align: 'center',title: 'RGV', hide: false}
            ,{field: 'type$', align: 'center',title: '设备', hide: true}
            ,{field: 'rgvEndId', align: 'center',title: '尾部穿梭板', hide: true}
            ,{field: 'ioTime$', align: 'center',title: '作业时间', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '创建时间', hide: true}
            ,{field: 'ioTime$', align: 'center',title: '作业时间', hide: false}
            ,{field: 'modiTime$', align: 'center',title: '创建时间', hide: false}
            ,{field: 'appeTime$', align: 'center',title: '更新时间', hide: false}

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

 src/main/webapp/views/wrkMastExecute/wrkMastExecute.html

@@ -29,6 +29,16 @@
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="jar_id" placeholder="设备号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="io_type" 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>

 src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html

@@ -29,6 +29,16 @@
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="jar_id" placeholder="设备号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="io_type" 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>