#
lsh
2 天以前 26947db0d67342aa6e706047884f88697fc406e1
#
4个文件已修改
26 ■■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensRgvThread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wms/js/basErrLog/basErrLog.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/basErrLog/basErrLog.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/deviceOperate/rgvOperate.html 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -142,7 +142,7 @@
        }
        rgvProtocol.setMode((short) -1);
        rgvProtocol.setStatus((short)-1);
        rgvProtocol.setTaskNo1(1002);
        rgvProtocol.setTaskNo1(0);
        rgvProtocol.setStatus1((short)-1);
        rgvProtocol.setLoaded1((short)0);
        rgvProtocol.setWalkPos((short)0);
@@ -185,7 +185,7 @@
     */
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 36);
            if (result.IsSuccess) {
                if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
                    rgvProtocol = new RgvProtocol();
src/main/webapp/static/wms/js/basErrLog/basErrLog.js
@@ -26,7 +26,7 @@
            ,{field: 'endTime$', align: 'center',title: '结束时间'}
            ,{field: 'wrkSts$', align: 'center',title: '任务状态'}
            ,{field: 'ioType$', align: 'center',title: '入出库类型'}
            ,{field: 'crnNo', align: 'center',title: '堆垛机'}
            ,{field: 'crnNo', align: 'center',title: '设备号'}
            ,{field: 'plcNo', align: 'center',title: 'plc', hide: true}
            ,{field: 'locNo', align: 'center',title: '目标库位', hide: true}
            ,{field: 'staNo', align: 'center',title: '目标站', hide: true}
src/main/webapp/views/basErrLog/basErrLog.html
@@ -21,7 +21,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机" autocomplete="off">
            <input class="layui-input" type="text" name="crn_no" placeholder="设备号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -20,12 +20,13 @@
                        <span>设备位置</span>
                    </div>
                    <el-row >
                        <el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" :offset="9"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                    </el-row>
                    <el-row  type="flex" justify="center">
                        <el-col :span="18" >
                        <el-col :span="7" >
                            <el-slider v-model="value1" :min="min" :max="max" :format-tooltip="formatTooltip" >
                            </el-slider>
                        </el-col>
@@ -33,13 +34,15 @@
                    </el-row>
                    <el-row >
                        <el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" :offset="8"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" :offset="13"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" :offset="2"><el-card class="card-bg"></el-card></el-col>
                        <el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
                    </el-row>
                </el-card>
        </div>
@@ -305,8 +308,8 @@
                demo: 'X',
                rgvMode: 0,
                value1:50000,
                min:8000,
                max:80000
                min:8300,
                max:75000
            },
            created() {
                this.init()
@@ -382,7 +385,8 @@
                        method: 'post',
                        success: function (res) {
                            that.tableData = res.data
                            that.value1 = res.data.rgvPos
                            that.value1 = res.data[0].rgvPos
                        }
                    });
                },