| src/main/java/com/zy/asrs/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/plugin/NormalProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/css/watch/console_vue.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/watch/console.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -151,6 +151,7 @@ // 使用实际列值作为偏移参考,避免随机坐标导致界面漂移 vo.setOffset(Double.valueOf(crnProtocol.getBay())); vo.setBay(crnProtocol.getBay()); // 当前列 vo.setTaskNo(crnProtocol.getTaskNo()); /** * 堆垛机状态判断 */ src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -13,6 +13,9 @@ // 堆垛机编号 private Integer crnId; //工作号 private Integer taskNo; // 偏移量 private Double offset; src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -1,28 +1,32 @@ package com.zy.core.plugin; import com.alibaba.fastjson.JSON; import com.zy.asrs.service.BasMapService; import com.zy.core.utils.CrnOperateProcessUtils; import com.zy.core.utils.StationOperateProcessUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; @Slf4j @Component public class NormalProcess implements MainProcessPluginApi{ @Autowired private BasMapService basMapService; private CrnOperateProcessUtils crnOperateUtils; @Autowired private StationOperateProcessUtils stationOperateProcessUtils; @Override public void run() { getLevList(); } private void getLevList() { List<Integer> list = basMapService.getLevList(); System.out.println(JSON.toJSONString(list)); //执行堆垛机任务 crnOperateUtils.crnIoExecute(); //堆垛机任务执行完成-具备仿真能力 crnOperateUtils.crnIoExecuteFinish(); //执行输送站点入库任务 stationOperateProcessUtils.stationInExecute(); //执行输送站点出库任务 stationOperateProcessUtils.stationOutExecute(); //检测输送站点出库任务执行完成 stationOperateProcessUtils.stationOutExecuteFinish(); } } src/main/webapp/static/css/watch/console_vue.css
@@ -110,7 +110,7 @@ /* 入库 */ .machine-pakin { background-color: rgb(163, 214, 242); background-color: rgb(48, 191, 252); } /* 出库 */ src/main/webapp/views/watch/console.html
@@ -228,6 +228,12 @@ var crnEl = $("#crn-" + crns[i].crnId); crnEl.attr("class", "crn-item " + crns[i].crnStatus); if (crns[i].taskNo != null && crns[i].taskNo > 0) { crnEl.html(crns[i].crnId + "[" + crns[i].taskNo + "]"); } else { crnEl.html(crns[i].crnId); } let bay = parseInt(crns[i].bay, 10); if (isNaN(bay) || bay < 1 || bay === -2) { bay = 1;