| src/main/java/com/zy/asrs/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/model/protocol/StaProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/wcs/css/render.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/realtimeWatch/console.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -121,7 +121,8 @@ StaProtocol staProtocol = entry.getValue(); vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号 vo.setWorkNo(staProtocol.getWorkNo()); // 工作号 vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 状态 String faultDescription = staProtocol.getFaultDescription(); vo.setSiteStatus(Cools.isEmpty(faultDescription) ? SiteStatusType.process(staProtocol) : SiteStatusType.SITE_ERROR); // 状态 vo.setNearbySta(staProtocol.getNearbySta()); //RGV位置 vos.add(vo); } @@ -303,6 +304,7 @@ vo.setCanining(basDevp.getCanining()); // 能入 vo.setCanouting(basDevp.getCanouting()); // 能出 vo.setError(staProtocol.getFaultDescription()); return R.ok().add(vo); } src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -18,6 +18,8 @@ SITE_AUTO_RUN, // 自动+ID SITE_AUTO_ID, // 有异常 SITE_ERROR ;
@@ -44,4 +44,6 @@ // 目标库位 private String locNo = ""; private String error=""; } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -92,7 +92,11 @@ taskWrk.setWrkSts(11); // if (!Cools.isEmpty(param.getStartPoint())) { taskWrk.setStartPoint(param.getStartPoint());//起点 taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1)); if (Integer.parseInt(param.getTargetPoint()) == 211 || Integer.parseInt(param.getTargetPoint()) == 206 || Integer.parseInt(param.getTargetPoint()) == 202) { taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) + 1)); } else { taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1)); } // } // taskWrk.setTargetPoint(param.getTargetPoint()); } else if (param.getIoType() == 3) { src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -110,6 +110,15 @@ private Boolean upcontactErr = false; //顶升电机接触器故障 private Boolean pushTheEnvelopeErr = false; // 提升上极限 private Boolean raiseTheLowerLimitErr = false; // 提升下极限 private Boolean leftProtectionTriggersErr = false; // 左保护触发 private Boolean rightProtectionTriggersErr = false; // 右保护触发 private Boolean gratingBlockingErr = false; // 光栅阻挡 private Short agvStartPick; //允许取货 private Short agvStartPlace; //允许放货 @@ -121,6 +130,38 @@ private List<Integer> alarm; // 获取故障描述 public String getFaultDescription(){ String faultDescription = ""; if (breakerErr) { faultDescription = "电路保护器断开"; } else if(infraredErr) { faultDescription = "光电异常(检查托盘是否卡住)"; }else if(outTimeErr) { faultDescription = "运行超时(检查托盘是否卡住)"; }else if(seizeSeatErr) { faultDescription = "占位超时(检查AGV是否长时间阻挡光电且无交互信号)"; }else if(wrkYgoodsN) { faultDescription = "有任务无货故障(AGV取货离开后长时间没有收到AGV离开信号)"; }else if(inverterErr) { faultDescription = "变频器故障:"; }else if(contactErr) { faultDescription = "接触器故障"; }else if(upcontactErr) { faultDescription = "顶升电机接触器故障"; } else if(pushTheEnvelopeErr) { faultDescription = "提升上极限"; } else if(raiseTheLowerLimitErr) { faultDescription = "提升下极限"; } else if(leftProtectionTriggersErr) { faultDescription = "保护光电触发(检查AGV放货位置)"; } else if(rightProtectionTriggersErr) { faultDescription = "右保护触发"; } else if(gratingBlockingErr) { faultDescription = "光栅阻挡"; } return faultDescription; } public List<Integer> getAlarm() { List<Integer> alarm = new ArrayList<>(); src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -415,11 +415,11 @@ } // 读正面故障反馈 OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (16 * 4)); OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2340.0", (short) (16 * 2)); if (resultErr.IsSuccess) { for (int i = 0; i < 16; i++) { Integer siteId = staNos.get(i); // 站点编号 boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1); boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 2, 2); StaProtocol staProtocol = station.get(siteId); staProtocol.setBreakerErr(status[0]); staProtocol.setInfraredErr(status[1]); @@ -429,7 +429,11 @@ staProtocol.setInverterErr(status[5]); staProtocol.setContactErr(status[6]); staProtocol.setUpcontactErr(status[7]); staProtocol.setPushTheEnvelopeErr(status[8]); staProtocol.setRaiseTheLowerLimitErr(status[9]); staProtocol.setLeftProtectionTriggersErr(status[10]); staProtocol.setRightProtectionTriggersErr(status[11]); staProtocol.setGratingBlockingErr(status[12]); } }
@@ -341,7 +341,7 @@ } /* 自动+有物+ID */ .site-auto-run-id { background-color: rgb(252,48,48); background-color: rgb(52, 168, 222); } /* 自动+有物 */ .site-auto-run { @@ -359,6 +359,9 @@ .site-unauto { background-color: rgb(184,184,184); } .site-error{ background-color: rgb(252,48,48); } #code { background-image: url(../images/status_bar_2.png); background-repeat: no-repeat; src/main/webapp/views/realtimeWatch/console.html
@@ -90,6 +90,7 @@ <span class="site-auto-id">自动+ID</span> <span class="site-auto">自动</span> <span class="site-unauto">非自动/手动</span> <span class="site-error">异常</span> </div> </div> <div class="bar-code"> @@ -343,6 +344,15 @@ <input type="text" name="locNo" value=""> </div> </div> <!-- 异常 --> <div class="form-item"> <div class="form-item-label"> <span>异常：</span> </div> <div class="form-item-input"> <input type="text" name="error" value=""> </div> </div> <!-- 操作按钮 --> <div class="form-item"> <a id="devpCommand" class="layui-btn">下发命令</a>
