| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/utils/RouteUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -750,6 +750,7 @@ if ((wrkMast.getIoType() != 12 && wrkMast.getIoType() < 100) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) { continue; } // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档 CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); @@ -818,7 +819,7 @@ } else { staProtocolOut = staProtocolOut.clone(); } if(staProtocolOut.getWorkNo() != null &&staProtocolOut.getStaNo() == 4006){ if(staProtocolOut.getWorkNo() != null && staProtocolOut.getStaNo() == 4006){ WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo()); WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997); if(wrkMast == null){ @@ -2699,7 +2700,9 @@ if (rgvProtocol.getStatusType() == RgvStatusType.IDLE && rgvProtocol.getModeType() == RgvModeType.AUTO && !rgvProtocol.isLoaded1ing() //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接 && (rgvProtocol.getTaskNo1()==0) && rgvProtocol.getTaskNo1()==0 && !rgvProtocol.isLoaded2ing() && rgvProtocol.getTaskNo2()==0 &&rgvThread.isPakMk() ) { BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo()); @@ -2715,7 +2718,9 @@ if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE && rgvProtocolOther.getModeType() == RgvModeType.AUTO && !rgvProtocolOther.isLoaded1ing() && (rgvProtocolOther.getTaskNo1()==0) && rgvProtocolOther.getTaskNo1()==0 && !rgvProtocolOther.isLoaded2ing() && rgvProtocolOther.getTaskNo2()==0 &&rgvThreadOther.isPakMk() ){ //对工作档进行判断 @@ -3492,7 +3497,7 @@ // if (staNos.contains(wrkMastSta.getStaStart())) {//非入库口（出库口）限制 // continue; // } // boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发 // boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta,null); //命令下发 // wrkEnable = true; // if (sign){ // wrkMastSta.setWrkSts(1); src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -30,7 +30,16 @@ // RGV轨道正序（从上到下） public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = Arrays.asList( 1004,1007,1010,1014,1018,1021,1024,1028,1031,1035 1004, 1007, 1010, 1014, 1018, 1021, 1024, 1028, 1031, 1035 ); // 反序（直接反转生成） src/main/resources/application.yml
@@ -293,58 +293,105 @@ slot: 0 # 入库口1 inSta[0]: staNo: 106 staNo: 1044 barcode: ${wcs-slave.barcode[0].id} barcodeMat: ${wcs-slave.barcode[3].id} backSta: 105 backSta: 1041 led: ${wcs-slave.led[1].id} # 空板入库口1 emptyInSta[0]: staNo: 106 staNo: 1038 barcode: ${wcs-slave.barcode[0].id} backSta: 105 backSta: 1038 led: ${wcs-slave.led[1].id} # 拣料入库口1 pickSta[0]: staNo: 159 staNo: 1036 barcode: ${wcs-slave.barcode[2].id} led: ${wcs-slave.led[5].id} backSta: 160 backSta: 1037 # 入库口1 inSta[1]: staNo: 107 staNo: 1103 barcode: ${wcs-slave.barcode[1].id} barcodeMat: ${wcs-slave.barcode[4].id} backSta: 108 backSta: 1041 led: ${wcs-slave.led[2].id} # 空板入库口1 emptyInSta[1]: staNo: 107 barcode: ${wcs-slave.barcode[1].id} backSta: 108 led: ${wcs-slave.led[2].id} inSta[2]: staNo: 159 barcode: ${wcs-slave.barcode[2].id} barcodeMat: ${wcs-slave.barcode[5].id} backSta: 160 led: ${wcs-slave.led[5].id} # # 拣料入库口1 # pickSta[1]: # staNo: 107 # barcode: ${wcs-slave.barcode[1].id} # led: ${wcs-slave.led[1].id} # backSta: 108 # inSta[2]: # staNo: 159 # barcode: ${wcs-slave.barcode[2].id} # barcodeMat: ${wcs-slave.barcode[5].id} # backSta: 160 # led: ${wcs-slave.led[5].id} # 出库口1 outSta[0]: staNo: 100 staNo: 1041 led: ${wcs-slave.led[0].id} # 输送线1 devp[1]: id: 2 ip: 10.10.10.50 port: 102 rack: 0 slot: 0 # 入库口1 inSta[0]: staNo: 2035 barcode: ${wcs-slave.barcode[0].id} barcodeMat: ${wcs-slave.barcode[3].id} backSta: 2034 led: ${wcs-slave.led[1].id} # # 空板入库口1 # emptyInSta[0]: # staNo: 106 # barcode: ${wcs-slave.barcode[0].id} # backSta: 105 # led: ${wcs-slave.led[1].id} # # 拣料入库口1 # pickSta[0]: # staNo: 159 # barcode: ${wcs-slave.barcode[2].id} # led: ${wcs-slave.led[5].id} # backSta: 160 # 入库口1 inSta[1]: staNo: 4001 barcode: ${wcs-slave.barcode[1].id} barcodeMat: ${wcs-slave.barcode[4].id} backSta: 4003 led: ${wcs-slave.led[2].id} # # 空板入库口1 # emptyInSta[1]: # staNo: 107 # barcode: ${wcs-slave.barcode[1].id} # backSta: 108 # led: ${wcs-slave.led[2].id} # inSta[2]: # staNo: 159 # barcode: ${wcs-slave.barcode[2].id} # barcodeMat: ${wcs-slave.barcode[5].id} # backSta: 160 # led: ${wcs-slave.led[5].id} # # 拣料入库口1 # pickSta[1]: # staNo: 107 # barcode: ${wcs-slave.barcode[1].id} # led: ${wcs-slave.led[1].id} # backSta: 108 # 出库口1 outSta[0]: staNo: 2033 led: ${wcs-slave.led[0].id} outSta[1]: staNo: 152 staNo: 4006 led: ${wcs-slave.led[3].id} outSta[2]: staNo: 156 led: ${wcs-slave.led[4].id} # outSta[2]: # staNo: 156 # led: ${wcs-slave.led[4].id} # 条码扫描仪1 barcode[0]:
