| src/main/java/com/zy/asrs/entity/BasDevp.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/model/DevpSlave.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/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -214,7 +214,7 @@ @TableField("cart_pos") private Integer cartPos; @ApiModelProperty(value = "拆垛上传叠盘回库标记") @ApiModelProperty(value = "1楼拆垛上传叠盘回库标记") @TableField("report_sign") private Integer reportSign;
@@ -228,6 +228,62 @@ } /** * 组托 * 入库站，根据条码扫描通知桁架码垛 */ public synchronized void generateStoreWrkFileFull2LouM() { // 根据输送线plc遍历 for (DevpSlave devp : slaveProperties.getDevp()) { // 遍历码垛口 for (DevpSlave.Sta driveSta : devp.getDriveSta()) { // 获取条码扫描仪信息 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, driveSta.getBarcode()); if (barcodeThread == null) { continue; } String barcode = barcodeThread.getBarcode(); if (!Cools.isEmpty(barcode) && !barcode.equals("") && !barcode.equals(" ")) { if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { continue; } } else { continue; } // 获取码垛口信息 SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); StaProtocol staProtocol = devpThread.getStation().get(driveSta.getStaNo()); if (staProtocol == null) { continue; } else { staProtocol = staProtocol.clone(); } // 判断是否满足入库条件 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000) ) ) { try { BasDevp basDevp = basDevpService.selectById(driveSta.getStaNo()); if (basDevp.getReportSign()>0){ continue; } basDevp.setBarcode(barcode); basDevp.setReportSign(1); basDevpService.updateById(basDevp); } catch (Exception e) { e.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } } } } } /** * wms入库 * 入库站，根据条码扫描生成入库工作档，工作状态 1 ==>> 2 */ @@ -3954,7 +4010,7 @@ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.getWorkNo() == 0 && (staProtocol.getWorkNo() == 0 || (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000)) ) {//&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) { //任务完成 src/main/java/com/zy/core/MainProcess.java
@@ -53,6 +53,8 @@ // mainService.ioConvert(); // 入库 ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档 mainService.generateStoreWrkFile(); // 组托 // 入库 ===>> 码垛位获取空板条码信息 mainService.generateStoreWrkFileFull2LouM(); // 组托 // mainService.generateStoreWrkFile0(); // WMS入库 // 拣料、并板、盘点再入库 mainService.stnToCrnStnPick(); src/main/java/com/zy/core/model/DevpSlave.java
@@ -20,6 +20,7 @@ private Integer slot; private List<Sta> inSta = new ArrayList<>(); private List<Sta> driveSta = new ArrayList<>(); private List<Sta> emptyInSta = new ArrayList<>();
@@ -58,10 +58,10 @@ public BasDevp toSqlModel(){ BasDevp basDevp = new BasDevp(); basDevp.setDevNo(siteId); basDevp.setWrkNo(workNo.intValue()); basDevp.setWrkNo(workNo); basDevp.setAutoing(autoing?"Y":"N"); basDevp.setLoading(loading?"Y":"N"); if (basDevp.getLoading().equals("N")){ if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y")){ basDevp.setReportSign(0); } basDevp.setInEnable(inEnable?"Y":"N"); src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -71,7 +71,7 @@ /** * 条码数量 */ private int barcodeSize = 3; private int barcodeSize = 5; /** * 入出库模式 @@ -247,10 +247,10 @@ //条码扫描器 Thread.sleep(200); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.288",(short)(barcodeSize*10)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,6, "UTF-8"); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8)); if (result2.IsSuccess && staNoSize==staNos2.size()) { for (int i = 0; i < barcodeSize; i++) { //1:217 2:221 3:null 4:215 5:219 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); @@ -261,7 +261,7 @@ //RGV小车 Thread.sleep(200); OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2); if (result3.IsSuccess) { if (result3.IsSuccess && staNoSize==staNos2.size()) { Integer siteId = 16; StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { src/main/resources/application.yml
@@ -342,7 +342,6 @@ # 入库口1 inSta[0]: staNo: 122 barcode: ${wcs-slave.barcode[0].id} # 空板入库口1 emptyInSta[0]: staNo: 122 @@ -352,23 +351,18 @@ # 拣料入库口1 pickSta2[0]: staNo: 118 barcode: ${wcs-slave.barcode[0].id} # 拣料入库口1 pickSta2[1]: staNo: 119 barcode: ${wcs-slave.barcode[0].id} # 拣料入库口1 pickSta2[2]: staNo: 120 barcode: ${wcs-slave.barcode[0].id} # 拣料入库口1 pickSta2[3]: staNo: 121 barcode: ${wcs-slave.barcode[0].id} # 拣料入库口1 pickSta[0]: staNo: 122 barcode: ${wcs-slave.barcode[0].id} # Rgv出库口1 outRgvSta[0]: staNo: 102 @@ -433,7 +427,14 @@ # 拣料入库口1 pickSta[0]: staNo: 212 barcode: ${wcs-slave.barcode[0].id} # 2楼码垛位置 driveSta[0]: staNo: 215 barcode: ${wcs-slave.barcode[3].id} # 2楼码垛位置 driveSta[1]: staNo: 219 barcode: ${wcs-slave.barcode[4].id} # 条码扫描仪 barcode[0]:
