| src/main/java/com/zy/asrs/controller/SiteController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.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/views/deviceOperate/devpOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/SiteController.java
@@ -18,6 +18,7 @@ import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; import com.zy.core.DevpThread; import com.zy.core.thread.BarcodeThread; import com.zy.core.thread.SiemensDevpThread; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -114,7 +115,8 @@ // vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高"); //高低库位 vo.setLocType1(devp.getDevNo()==102 ? "高" : "低"); vo.setWeight(staProtocol.getGrossWt().toString()); vo.setErrorDev(staProtocol.getErrorDev()); vo.setBarcode(staProtocol.getBarcodeNow()); vo.setErrorDev(staProtocol.getErrorDev$()); } return R.ok().add(list); } src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -38,6 +38,7 @@ //高低库位 private String locType1 = "-"; private String weight = "-"; private String barcode = "-"; private String errorDev = "-"; private String car = "-"; } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -137,31 +137,55 @@ back = true; } if (staProtocol.isFrontErr()) { if (!back){ errMsg = "前超限"; } else { errMsg = errMsg+"---"+"前超限"; } back = true; } if (!back && staProtocol.isBackErr()) { if (staProtocol.isBackErr()) { if (!back){ errMsg = "后超限"; } else { errMsg = errMsg+"---"+"后超限"; } back = true; } if (!back && staProtocol.isHighErr()) { if (staProtocol.isHighErr()) { if (!back){ errMsg = "高超限"; } else { errMsg = errMsg+"---"+"高超限"; } back = true; } if (!back && staProtocol.isLeftErr()) { if (staProtocol.isLeftErr()) { if (!back){ errMsg = "左超限"; } else { errMsg = errMsg+"---"+"左超限"; } back = true; } if (!back && staProtocol.isRightErr()) { if (staProtocol.isRightErr()) { if (!back){ errMsg = "右超限"; } else { errMsg = errMsg+"---"+"右超限"; } back = true; } // if (!back && staProtocol.isWeightErr()) { // errMsg = "超重"; // back = true; // } if (!back && staProtocol.isBarcodeErr()) { if (staProtocol.isBarcodeErr()) { if (!back){ errMsg = "扫码失败"; } else { errMsg = errMsg+"---"+"扫码失败"; } back = true; } // 退回 @@ -1867,31 +1891,55 @@ back = true; } if (staProtocol.isFrontErr()) { if (!back){ errMsg = "前超限"; } else { errMsg = errMsg+"---"+"前超限"; } back = true; } if (!back && staProtocol.isBackErr()) { if (staProtocol.isBackErr()) { if (!back){ errMsg = "后超限"; } else { errMsg = errMsg+"---"+"后超限"; } back = true; } if (!back && staProtocol.isHighErr()) { if (staProtocol.isHighErr()) { if (!back){ errMsg = "高超限"; } else { errMsg = errMsg+"---"+"高超限"; } back = true; } if (!back && staProtocol.isLeftErr()) { if (staProtocol.isLeftErr()) { if (!back){ errMsg = "左超限"; } else { errMsg = errMsg+"---"+"左超限"; } back = true; } if (!back && staProtocol.isRightErr()) { if (staProtocol.isRightErr()) { if (!back){ errMsg = "右超限"; } else { errMsg = errMsg+"---"+"右超限"; } back = true; } // if (!back && staProtocol.isWeightErr()) { // errMsg = "超重"; // back = true; // } if (!back && staProtocol.isBarcodeErr()) { if (staProtocol.isBarcodeErr()) { if (!back){ errMsg = "扫码失败"; } else { errMsg = errMsg+"---"+"扫码失败"; } back = true; } // 退回 src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,7 +1,10 @@ package com.zy.core.model.protocol; import com.core.common.Cools; import com.zy.asrs.entity.BasDevp; import lombok.Data; import java.text.SimpleDateFormat; /** * 输送线plc单个站点详细信息 @@ -80,6 +83,30 @@ // 扫码失败 private boolean barcodeErr; // 电路保护器断开 private boolean errOther1; // 光电异常 private boolean errOther2; // 运行超时 private boolean errOther3; // 占位超时 private boolean errOther4; // 有任务无货故障 private boolean errOther5; // 变频器故障 private boolean errOther6; // 接触器故障 private boolean errOther7; // 顶升电机接触器故障 private boolean errOther8; // Super有无信息 private boolean loadingSuper = true; @@ -87,6 +114,7 @@ private Integer commandId; private Double grossWt = 0D; private String errorDev = "-"; private String barcodeNow = "-"; public BasDevp toSqlModel(){ BasDevp basDevp = new BasDevp(); @@ -114,4 +142,80 @@ return null; } public String getErrorDev$(){ if (errorDev.equals("-")){ boolean back = false; String errMsg = "-"; if (this.isErrOther1()) { if (!back){ errMsg = "电路保护器断开"; } else { errMsg = errMsg+"---"+"电路保护器断开"; } back = true; } if (this.isErrOther2()) { if (!back){ errMsg = "光电异常"; } else { errMsg = errMsg+"---"+"光电异常"; } back = true; } if (this.isErrOther3()) { if (!back){ errMsg = "运行超时"; } else { errMsg = errMsg+"---"+"运行超时"; } back = true; } if (this.isErrOther4()) { if (!back){ errMsg = "占位超时"; } else { errMsg = errMsg+"---"+"占位超时"; } back = true; } if (this.isErrOther5()) { if (!back){ errMsg = "有任务无货故障"; } else { errMsg = errMsg+"---"+"有任务无货故障"; } back = true; } if (this.isErrOther6()) { if (!back){ errMsg = "变频器故障"; } else { errMsg = errMsg+"---"+"变频器故障"; } back = true; } if (this.isErrOther7()) { if (!back){ errMsg = "接触器故障"; } else { errMsg = errMsg+"---"+"接触器故障"; } back = true; } if (this.isErrOther8()) { if (!back){ errMsg = "顶升电机接触器故障"; } else { errMsg = errMsg+"---"+"顶升电机接触器故障"; } back = true; } if (back){ return errMsg; } } return errorDev; } } src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -323,25 +323,33 @@ } } } int[] staW = new int[]{1004,1014,1020}; //条码 // Thread.sleep(50); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { Integer siteId = staW[i]; // 站点编号 StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { staProtocol = new StaProtocol(); station.put(siteId, staProtocol); } String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); } staProtocol.setBarcodeNow(barcode); } } //条码 // Thread.sleep(50); int[] staW = new int[]{1004,1014,1020}; OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4)); OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0",(short) (staW.length*4)); if (result3.IsSuccess) { for (int i = 0; i < staW.length; i++) { Integer siteId = staW[i]; // 站点编号 @@ -357,6 +365,19 @@ staProtocol.setHighErr(status[2]); // 高超限 staProtocol.setLeftErr(status[3]); // 左超限 staProtocol.setRightErr(status[4]); // 右超限 staProtocol.setWeightErr(status[5]); // 超重 staProtocol.setBarcodeErr(status[6]); // 扫码失败 if (resultErr.IsSuccess){ boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 2); staProtocol.setErrOther1(statusErr[0]); // 电路保护器断开 staProtocol.setErrOther1(statusErr[1]); // 光电异常 staProtocol.setErrOther1(statusErr[2]); // 运行超时 staProtocol.setErrOther1(statusErr[3]); // 占位超时 staProtocol.setErrOther1(statusErr[4]); // 有任务无货故障 staProtocol.setErrOther1(statusErr[5]); // 变频器故障 staProtocol.setErrOther1(statusErr[6]); // 接触器故障 staProtocol.setErrOther1(statusErr[7]); // 顶升电机接触器故障 } } }
@@ -99,6 +99,8 @@ </el-descriptions-item> <el-descriptions-item label="重量">{{ tableData[currentIndex].weight }} </el-descriptions-item> <el-descriptions-item label="条码">{{ tableData[currentIndex].barcode }} </el-descriptions-item> <el-descriptions-item label="异常提示">{{ tableData[currentIndex].errorDev }} </el-descriptions-item> </el-descriptions>
