| src/main/java/com/zy/asrs/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 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/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/WrkMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -152,6 +152,9 @@ if(crnProtocol.getAlarm() == 10){ crnProtocol.setAlarm((short) 0); } if(crnProtocol.getAlarm() == 6){ crnProtocol.setAlarm((short) 0); } if (crnProtocol.getAlarm() > 0) { vo.setCrnStatus(CrnStatusType.MACHINE_ERROR); } else { src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -40,6 +40,7 @@ // 拣料再入库时，站点有物且需求时查询 // @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)") WrkMast selectPickStep(@Param("barcode")String barcode); WrkMast selectPickStep3(@Param("workNo")Integer workNo); // 出库第一步，从库位到堆垛机出库站 // @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc") src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -240,6 +240,7 @@ LocTypeDto locTypeDto = new LocTypeDto(staProtocol); SearchLocParam param = new SearchLocParam(); locTypeDto.setLocType1((short) 1); param.setBarcode(barcode); param.setIoType(1); param.setSourceStaNo(inSta.getStaNo()); @@ -445,6 +446,9 @@ errMsg = "扫码失败"; back = true; } if(staProtocol.getSiteId() > 400){ back = false; } // 退回 if (back) { @@ -472,23 +476,26 @@ } continue; } if (!Cools.isEmpty(barcode)) { News.infoNoLog("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { if(staProtocol.getSiteId() < 400){ if (!Cools.isEmpty(barcode)) { News.infoNoLog("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { continue; } } else { continue; } } else { continue; } if (!Cools.isEmpty(barcode)) { if (!Cools.isEmpty(barcode)) { // News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { continue; } } else { continue; } } else { continue; } @@ -504,6 +511,9 @@ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) { News.warnNoLog("" + mark + " - 0" + " - 开始执行"); WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode); if(staProtocol.getSiteId() > 400){ wrkMast = wrkMastMapper.selectPickStep3(staProtocol.getWorkNo()); } // WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue()); if (wrkMast == null) { // 无拣料数据 @@ -588,7 +598,9 @@ // 更新站点信息 且 下发plc命令 staProtocol.setWorkNo(wrkMast.getWrkNo()); staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString())); if(staProtocol.getSiteId() < 400){ staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString())); } devpThread.setPakMk(staProtocol.getSiteId(), false); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); log.error("输送线下发5：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo()); @@ -1005,6 +1017,9 @@ News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo()); continue; } // if(staProtocol.getWorkNo() == 9998){ // continue; // } if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable() && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) { flag = true; @@ -1800,6 +1815,12 @@ case 10: ledCommand.setTitle("空板入库"); break; case 53: ledCommand.setTitle("拣料再入库"); break; case 57: ledCommand.setTitle("盘点再入库"); break; case 101: ledCommand.setTitle("全板出库"); break; src/main/java/com/zy/core/MainProcess.java
@@ -60,7 +60,7 @@ // 入库 ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档 mainService.generateStoreWrkFile(1); // 组托 // mainService.generateStoreWrkFile0(2); // WMS入库 Thread.sleep(400); Thread.sleep(200); // 拣料、并板、盘点再入库 src/main/resources/application.yml
@@ -429,14 +429,14 @@ # 堆垛机入库站点 crnInStn[5]: devpPlcId: ${wcs-slave.devp[1].id} staNo: 403 staNo: 404 row: 7 bay: 1 lev: 4 # 堆垛机出库站点 crnOutStn[5]: devpPlcId: ${wcs-slave.devp[1].id} staNo: 403 staNo: 404 row: 7 bay: 1 lev: 4 @@ -515,6 +515,30 @@ barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[1].id} backSta: 230 # 拣料入库口1 pickSta[4]: staNo: 411 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[1].id} backSta: 411 # 拣料入库口1 pickSta[5]: staNo: 412 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[1].id} backSta: 412 # 拣料入库口1 pickSta[6]: staNo: 413 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[1].id} backSta: 413 # 拣料入库口1 pickSta[7]: staNo: 414 barcode: ${wcs-slave.barcode[4].id} led: ${wcs-slave.led[1].id} backSta: 414 # 空板入库口1 emptyInSta[0]: staNo: 123 @@ -655,6 +679,30 @@ barcode: ${wcs-slave.barcode[12].id} led: ${wcs-slave.led[1].id} backSta: 210 # 拣料入库口1 pickSta[4]: staNo: 401 barcode: ${wcs-slave.barcode[12].id} led: ${wcs-slave.led[1].id} backSta: 401 # 拣料入库口1 pickSta[5]: staNo: 402 barcode: ${wcs-slave.barcode[12].id} led: ${wcs-slave.led[1].id} backSta: 402 # 拣料入库口1 pickSta[6]: staNo: 403 barcode: ${wcs-slave.barcode[12].id} led: ${wcs-slave.led[1].id} backSta: 403 # 拣料入库口1 pickSta[7]: staNo: 404 barcode: ${wcs-slave.barcode[12].id} led: ${wcs-slave.led[1].id} backSta: 404 # 空板入库口1 emptyInSta[0]: staNo: 102 src/main/resources/mapper/WrkMastMapper.xml
@@ -106,6 +106,12 @@ select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104) </select> <select id="selectPickStep3" resultMap="BaseResultMap"> select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and io_type=107 </select> <select id="selectPakOutStep1" resultMap="BaseResultMap"> select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc </select>
