#
1
2025-05-09 3ceabb21c1fd2b7fbdbc5c77c23f26152ec7f9aa
#
2个文件已修改
79 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/RgvController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/deviceOperate/rgvOperate.html 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/RgvController.java
@@ -51,6 +51,30 @@
        return R.ok().add(res);
    }
    @PostMapping("/task/cache/all")
    @ManagerAuth(memo = "全部信息")
    public R allTaskCache(@RequestParam(defaultValue = "0")  Integer rgvNo){
        List<Map<String, Object>> res = new ArrayList<>();
        try{
            RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
            TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
            ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
            for (TaskProtocol taskProtocol : allTaskProtocol.values()){
                Map<String, Object> map2 = new HashMap<>();
                map2.put("rgvNo", rgvNo);
                map2.put("taskNo", taskProtocol.getTaskNo());
                map2.put("targetPosition", taskProtocol.getTargetPosition());
                map2.put("isRunning", taskProtocol.getIsRunning());
                map2.put("taskStatus", taskProtocol.getTaskStatus());
                map2.put("direction", taskProtocol.isDirection());
                res.add(map2);
            }
        } catch (Exception e){
//            return R.error("异常"+e.getMessage());
        }
        return R.ok().add(res);
    }
    @PostMapping("/run/walk")//Take  Put  Walk
    @ManagerAuth(memo = "小车行走")
    public R rgvRunWalk(@RequestParam(defaultValue = "0")  Integer rgvNo,
src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -69,29 +69,21 @@
                            <el-empty description="请选择设备"></el-empty>
                        </div>
                        <div v-else>
                            <el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
                                <el-descriptions-item label="站点">{{ tableData[currentIndex].devNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="工作号">
                                    {{ tableData[currentIndex].workNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="自动">{{ tableData[currentIndex].autoing }}
                                </el-descriptions-item>
                                <el-descriptions-item label="有物">{{ tableData[currentIndex].loading }}
                                </el-descriptions-item>
                                <el-descriptions-item label="可入">{{ tableData[currentIndex].inEnable }}
                                </el-descriptions-item>
                                <el-descriptions-item label="可出">{{ tableData[currentIndex].outEnable }}
                                </el-descriptions-item>
                                <el-descriptions-item label="入库标记">{{ tableData[currentIndex].pakMk }}
                                </el-descriptions-item>
                                <el-descriptions-item label="空板信号">{{ tableData[currentIndex].emptyMk }}
                                </el-descriptions-item>
                                <el-descriptions-item label="目标站">{{ tableData[currentIndex].staNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="高低库位">{{ tableData[currentIndex].locType1 }}
                                </el-descriptions-item>
                            </el-descriptions>
                            <el-table ref="singleTable" :data="taskAllData" highlight-current-row @row-click="handleRowClick"
                                      max-height="450" style="width: 100%">
                                <el-table-column property="rgvNo" label="小车号">
                                </el-table-column>
                                <el-table-column property="taskNo" label="工作号">
                                </el-table-column>
                                <el-table-column property="taskStatus" label="作业模式">
                                </el-table-column>
                                <el-table-column property="isRunning" label="状态">
                                </el-table-column>
                                <el-table-column property="targetPosition" label="目标定位置">
                                </el-table-column>
                                <el-table-column property="direction" label="放向">
                                </el-table-column>
                            </el-table>
                        </div>
                    </div>
                </el-card>
@@ -103,6 +95,7 @@
            el: '#app',
            data: {
                tableData: [],
                taskAllData: [],
                currentRow: null,
                currentTitle: "未选择设备",
                currentIndex: null,
@@ -137,6 +130,22 @@
                    this.formParam.taskNo = row.taskNo
                    this.formParam.rgvStaNo = row.rgvStaNo
                    this.formParam.rgvPosDestination = row.rgvPosDestination
                    this.getTaskAllData(index+1)
                },
                getTaskAllData(index) {
                    let that = this;
                    $.ajax({
                        url: baseUrl + "/rgv/task/cache/all",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
                        data: {rgvNo: index},
                        method: 'POST',
                        success: function (res) {
                            that.taskAllData = res.data
                        }
                    });
                },
                getTableData() {
                    let that = this;