| src/main/java/com/zy/asrs/entity/WrkMast.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -391,6 +391,7 @@ case 3: return 211; } break; case 214: switch (crnNo){ case 1: @@ -400,6 +401,7 @@ case 3: return 214; } break; } return this.staNo; } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -854,7 +854,9 @@ continue; } WrkMast onlyWrkNo = wrkMastMapper.selectByOnlyWrkNo(crnProtocol.getTaskNo().intValue()); if (Cools.isEmpty(onlyWrkNo)){ if (Cools.isEmpty(onlyWrkNo) || (onlyWrkNo.getStaNo()!=114 && onlyWrkNo.getStaNo()!=214 && onlyWrkNo.getSourceStaNo()!=114 && onlyWrkNo.getSourceStaNo()!=214)){ continue; } // 判断堆垛机状态等待确认 @@ -864,6 +866,8 @@ && crnProtocol.getBay().equals(crnStn.getBay().shortValue()) && crnProtocol.getLevel().equals(crnStn.getLev().shortValue())) { News.info("堆垛机接驳任务完成，工作号："+crnProtocol.getTaskNo()+"；执行堆垛机号："+crnSlave.getId()+"；接驳放货位："+crnStn.getStaNo()+"；接驳行走目标站："+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo())); // 下发站点信息 News.error("new867===>"+crnProtocol.getTaskNo()); News.error("new867===>"+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).toString()); staProtocol.setWorkNo(crnProtocol.getTaskNo()); staProtocol.setStaNo(Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).shortValue()); if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) { @@ -875,7 +879,7 @@ } } } catch (Exception e){ News.info("堆垛机接驳任务完成，一场："+e.getMessage()); News.info("堆垛机接驳任务完成，异常："+e.getMessage()); } continue; } @@ -899,6 +903,8 @@ // 下发站点信息 staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue()); News.error("new902===>"+crnProtocol.getCrnNo().toString()); News.error("new902===>"+wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).toString()); staProtocol.setStaNo(wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).shortValue()); if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) { continue; @@ -1040,7 +1046,7 @@ } continue; } catch (Exception e){ News.info("堆垛机接驳任务执行，一场："+e.getMessage()); News.info("堆垛机接驳任务执行，异常："+e.getMessage()); } continue; } src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,7 +56,7 @@ add(112);add(113);add(114); }}; public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{ add(212);add(214);add(213); add(212);add(213);add(214); }}; public boolean charge0; @@ -211,26 +211,37 @@ //读条码 Thread.sleep(200); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); if (slave.getId()==1){ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); } } } // 充电信号位 Thread.sleep(200); OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1); if (result3.IsSuccess) { boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1); charge0 = status[0]; charge1 = status[1]; charge2 = status[2]; } } else { OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(8)); if (result2.IsSuccess) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId()+1); if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); } } } // 充电信号位 Thread.sleep(200); OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1); if (result3.IsSuccess) { boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1); charge0 = status[0]; charge1 = status[1]; charge2 = status[2]; } if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) { src/main/resources/application.yml
@@ -224,13 +224,13 @@ slot: 0 # 入库口1 inSta[0]: staNo: 114 staNo: 113 barcode: ${wcs-slave.barcode[2].id} backSta: 100 led: ${wcs-slave.led[2].id} # 空板入库口1 emptyInSta[0]: staNo: 114 staNo: 113 barcode: ${wcs-slave.barcode[2].id} # 出库口1 outSta[0]: @@ -244,13 +244,13 @@ slot: 0 # 入库口1 inSta[0]: staNo: 214 staNo: 213 barcode: ${wcs-slave.barcode[3].id} backSta: 100 led: ${wcs-slave.led[3].id} # 空板入库口1 emptyInSta[0]: staNo: 214 staNo: 213 barcode: ${wcs-slave.barcode[3].id} # 出库口1 outSta[0]:
