| src/main/java/com/zy/asrs/mapper/WrkMastMapper.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/mapper/WrkMastMapper.java
@@ -109,7 +109,7 @@ Integer selectExistInEmpty(); @Select("select * from where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC") @Select("select * from asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC") public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo); public List<WrkMast> selectWaitPakIn(@Param("wrkNos")List<Integer> wrkNos); src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -118,7 +118,7 @@ String barcode = barcodeThread.getBarcode(); //9998退回，9996空板 if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) { log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode); // log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { String errorMsg = "15站扫码失败，已退回14站"; staProtocol.setWorkNo((short) 9998); @@ -380,7 +380,7 @@ String barcode = barcodeThread.getBarcode(); if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) { log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode); // log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { staProtocol.setWorkNo((short) 9998); staProtocol.setStaNo((short) 14); @@ -708,7 +708,14 @@ } WrkMast wrkMast1 = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo()); if(null == wrkMast1) { // log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo()); continue; } wrkNos.add(wrkMast1.getWrkNo()); } if (Cools.isEmpty(wrkNos)){ return; } List<WrkMast> wrkMasts=wrkMastService.selectWaitPakIn(wrkNos); @@ -1684,7 +1691,6 @@ && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 9996) && staProtocol.isPakMk()) { try { src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -183,7 +183,7 @@ station.put(siteId, staProtocol); } staProtocol.setStaNo( siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 )); // 目标站 Thread.sleep(300); // Thread.sleep(300); staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 工作号 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8+6, 2); @@ -203,8 +203,8 @@ } //条码扫描器 Thread.sleep(200); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.40",(short)(barcodeSize*10)); // Thread.sleep(200); OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*10)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8"); @@ -216,7 +216,7 @@ } //RGV小车 Thread.sleep(200); // Thread.sleep(200); OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2); if (result3.IsSuccess) { Integer siteId = 16; @@ -232,7 +232,6 @@ /** * 母托盘出库 */ Thread.sleep(200); OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.172",(short)2); if (result4.IsSuccess) { Integer siteId = 12; @@ -286,16 +285,18 @@ return; } int index = staNos.indexOf(staProtocol.getSiteId()); short[] array = new short[2]; array[0] = staProtocol.getWorkNo(); array[1] = staProtocol.getStaNo(); OperateResult write = siemensS7Net.Write("DB100." + index*4, array); // int[] array = new int[2]; // array[0] = staProtocol.getWorkNo(); // array[1] = staProtocol.getStaNo(); OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4),staProtocol.getStaNo()); OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 工作号 // Thread.sleep(500); // OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 目标站 if (!write.IsSuccess) { if (!write.IsSuccess && !write1.IsSuccess) { staProtocol = station.get(staProtocol.getSiteId()); if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) { staProtocol.setPakMk(true); src/main/resources/application.yml
@@ -35,7 +35,7 @@ enable: false wms: url: localhost:8080/phpswms url: localhost:8088/pswms # 下位机配置 wcs-slave: @@ -214,15 +214,15 @@ barcode: ${wcs-slave.barcode[0].id} led: ${wcs-slave.led[0].id} # 入库口2 inSta[1]: staNo: 103 barcode: ${wcs-slave.barcode[1].id} led: ${wcs-slave.led[1].id} # 入库口3 inSta[2]: staNo: 105 barcode: ${wcs-slave.barcode[2].id} led: ${wcs-slave.led[2].id} inSta[1]: staNo: 103 barcode: ${wcs-slave.barcode[1].id} led: ${wcs-slave.led[1].id} # 入库口3 inSta[2]: staNo: 105 barcode: ${wcs-slave.barcode[2].id} led: ${wcs-slave.led[2].id} # 空板入库口1 emptyInSta[0]: staNo: 101 @@ -266,15 +266,15 @@ barcode: ${wcs-slave.barcode[3].id} led: ${wcs-slave.led[3].id} # 入库口2 inSta[1]: staNo: 203 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[4].id} # 入库口3 inSta[2]: staNo: 205 barcode: ${wcs-slave.barcode[5].id} led: ${wcs-slave.led[5].id} inSta[1]: staNo: 203 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[4].id} # 入库口3 inSta[2]: staNo: 205 barcode: ${wcs-slave.barcode[5].id} led: ${wcs-slave.led[5].id} # 空板入库口1 emptyInSta[0]: staNo: 201 @@ -318,15 +318,15 @@ barcode: ${wcs-slave.barcode[6].id} led: ${wcs-slave.led[6].id} # 入库口2 inSta[1]: staNo: 303 barcode: ${wcs-slave.barcode[7].id} led: ${wcs-slave.led[7].id} # 入库口3 inSta[2]: staNo: 305 barcode: ${wcs-slave.barcode[8].id} led: ${wcs-slave.led[8].id} inSta[1]: staNo: 303 barcode: ${wcs-slave.barcode[7].id} led: ${wcs-slave.led[7].id} # 入库口3 inSta[2]: staNo: 305 barcode: ${wcs-slave.barcode[8].id} led: ${wcs-slave.led[8].id} # 空板入库口1 emptyInSta[0]: staNo: 301
