#

lsh

2024-01-26 6d1c07c3f902e5630129163759eb46bbd7435ca5

#

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

@@ -180,4 +180,85 @@
        Synchro.Copy(source, this);
    }

    public Integer getStaEnd(Integer souSta) {
        switch (souSta) {
            case 100:
            case 103:
            case 106:
            case 109:
            case 112:
            case 115:
                return souSta + 1;
            default:
                return souSta;
        }
    }

    public String getType$() {
        if (Cools.isEmpty(this.type)) {
            return "未知";
        }
        switch (this.type) {
            case 1:
                return "非空";
            case 2:
                return "空板";
            default:
                return "未知";
        }
    }

    /**
     * 工作状态 0：初始 1：等待小车取 2：等待小车放 3：完成
     */
    public String getWrkSts$() {
        if (Cools.isEmpty(this.wrkSts)) {
            try {
                if (this.wrkSts==0){
                    return "初始";
                }
            }catch (Exception e){
                return "未知";
            }
            return "未知";
        }
        switch (this.wrkSts) {
            case 0:
                return "初始";
            case 1:
                return "等待小车取";
            case 2:
                return "等待小车放";
            case 3:
                return "完成";
            default:
                return "未知";
        }
    }

    /**
     * 工作类型 1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放
     */
    public String getWrkType$() {
        if (Cools.isEmpty(this.wrkType)) {
            return "未知";
        }
        switch (this.wrkType) {
            case 1:
                return "叠盘";
            case 2:
                return "拆盘";
            case 3:
                return "取放";
            case 4:
                return "行走";
            case 5:
                return "满取";
            case 6:
                return "满放";
            default:
                return "未知";
        }
    }

}

 src/main/resources/mapper/WrkMastMapper.xml

@@ -67,7 +67,7 @@
    </select>

    <select id="selectToBeCompleteData202" resultMap="BaseResultMap">
        select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
        select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
    </select>

    <select id="selectToBeHistoryData" resultMap="BaseResultMap">

 src/main/webapp/static/js/wrkMastSta/wrkMastSta.js

@@ -28,7 +28,7 @@
            ,{field: 'wrkEnd', align: 'center',title: '工作档结束位置',hide: false}
            ,{field: 'staStart', align: 'center',title: '小车接货位置',hide: false}
            ,{field: 'staEnd', align: 'center',title: '小车放货位置',hide: false}
            ,{field: 'type$', align: 'center',title: '类型',hide: false}
            ,{field: 'type$', align: 'center',title: '货物类型',hide: false}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态',hide: false}
            ,{field: 'lineNumber', align: 'center',title: '行号',hide: true}
            ,{field: 'wrkType$', align: 'center',title: '工作类型',hide: false}

 src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js

@@ -21,23 +21,22 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'wrkStart', align: 'center',title: '工作档开始位置'}
            ,{field: 'wrkEnd', align: 'center',title: '工作档结束位置'}
            ,{field: 'staStart', align: 'center',title: '小车接货位置'}
            ,{field: 'staEnd', align: 'center',title: '小车放货位置'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'type', align: 'center',title: '类型 0:满版  1:空板'}
            ,{field: 'wrkSts', align: 'center',title: '工作状态 0：初始 1：等待小车取 2：等待小车放 3：完成'}
            ,{field: 'lineNumber', align: 'center',title: '行号'}
            ,{field: 'wrkType', align: 'center',title: '工作类型  类型  1:取（叠盘）  2：放 3：取放 4：拆盘'}
            ,{field: 'bignTime$', align: 'center',title: '标记时间'}
            ,{field: 'wrkCrn', align: 'center',title: ''}
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID',hide: true}
            ,{field: 'wrkNo', align: 'center',title: '工作号',hide: false}
            ,{field: 'wrkStart', align: 'center',title: '工作档开始位置',hide: false}
            ,{field: 'wrkEnd', align: 'center',title: '工作档结束位置',hide: false}
            ,{field: 'staStart', align: 'center',title: '小车接货位置',hide: false}
            ,{field: 'staEnd', align: 'center',title: '小车放货位置',hide: false}
            ,{field: 'type$', align: 'center',title: '货物类型',hide: false}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态',hide: false}
            ,{field: 'lineNumber', align: 'center',title: '行号',hide: true}
            ,{field: 'wrkType$', align: 'center',title: '工作类型',hide: false}
            ,{field: 'bignTime$', align: 'center',title: '标记时间',hide: false}
            ,{field: 'createTime$', align: 'center',title: '添加时间',hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间',hide: false}

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

 src/main/webapp/views/wrkMastSta/wrkMastSta.html

@@ -17,9 +17,50 @@
        <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">
                            <input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off">
                        </div>
                    </div>
                    <!-- 货物类型 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="type" id="type" class="layui-input" type="text" placeholder="货物类型" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="1">1.非空</option>
                                <option value="2">2.空板</option>
                            </select>
                        </div>
                    </div>
                    <!-- 工作状态 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="wrk_sts" id="wrk_sts" class="layui-input" type="text" placeholder="工作状态" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="0">0.初始</option>
                                <option value="1">1.等待小车取</option>
                                <option value="2">2.等待小车放</option>
                                <option value="3">3.完成</option>
                            </select>
                        </div>
                    </div>
                    <!-- 工作类型 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="wrk_type" id="wrk_type" class="layui-input" type="text" placeholder="工作类型" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="1">叠盘</option>
                                <option value="2">拆盘</option>
                                <option value="3">取放</option>
                                <!--                            <option value="2">2.行走</option>-->
                                <option value="5">满取</option>
                                <option value="6">满放</option>
                            </select>
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
@@ -120,9 +161,9 @@
<!--                        <input class="layui-input" name="type" placeholder="请输入类型 1:非空  2:空板" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <!-- 类型 -->
                <!-- 货物类型 -->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">类型：</label>
                    <label class="layui-form-label layui-form-required">货物类型：</label>
                    <div class="layui-input-inline">
                        <select name="type">
                            <option value="1">1.非空</option>
@@ -130,7 +171,7 @@
                        </select>
                    </div>
                </div>
                <!-- 类型 -->
                <!-- 工作状态 -->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">工作状态：</label>
                    <div class="layui-input-inline">
@@ -142,7 +183,7 @@
                        </select>
                    </div>
                </div>
                <!-- 类型 -->
                <!-- 工作类型 -->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">工作类型</label>
                    <div class="layui-input-inline">

 src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html

@@ -17,9 +17,50 @@
        <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">
                            <input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off">
                        </div>
                    </div>
                    <!-- 货物类型 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="type" id="type" class="layui-input" type="text" placeholder="货物类型" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="1">1.非空</option>
                                <option value="2">2.空板</option>
                            </select>
                        </div>
                    </div>
                    <!-- 工作状态 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="wrk_sts" id="wrk_sts" class="layui-input" type="text" placeholder="工作状态" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="0">0.初始</option>
                                <option value="1">1.等待小车取</option>
                                <option value="2">2.等待小车放</option>
                                <option value="3">3.完成</option>
                            </select>
                        </div>
                    </div>
                    <!-- 工作类型 -->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="wrk_type" id="wrk_type" class="layui-input" type="text" placeholder="工作类型" autocomplete="off">
                                <option style="display: none"></option>
                                <option value="1">叠盘</option>
                                <option value="2">拆盘</option>
                                <option value="3">取放</option>
                                <!--                            <option value="2">2.行走</option>-->
                                <option value="5">满取</option>
                                <option value="6">满放</option>
                            </select>
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
@@ -49,15 +90,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-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</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>