#

LSH

2024-04-03 f78f7a18a7fc91bea907c5238b788deb1e082364

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2318,6 +2318,7 @@
                        param.setIoType(10);
                        param.setSourceStaNo(122);
                        param.setLocType1((short)1);
                        param.setRgvNo(rgvProtocol.getRgvNo());
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/empty/loc/v1")
@@ -3696,6 +3697,18 @@
                        if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                            continue;
                        }
                        List<Integer> STA_WORK_CU1 = new ArrayList<Integer>() {{
                            add(101);add(102);add(104);add(105);add(107);add(108);add(118);add(119);add(122);
                        }};
                        List<Integer> STA_WORK_CU2 = new ArrayList<Integer>() {{
                            add(110);add(111);add(113);add(114);add(116);add(117);add(120);add(121);add(122);add(123);
                        }};
                        if (basRgv.getRgvNo()==1 && !STA_WORK_CU1.contains(wrkMastSta.getStaStart())){
                            continue;
                        }else if (basRgv.getRgvNo()==2 && !STA_WORK_CU2.contains(wrkMastSta.getStaStart())){
                            continue;
                        }

                        if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                            if (!basDevp.getEmptyMk().equals("Y")){
                                continue;
@@ -3935,6 +3948,17 @@
                            if (!basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y")){
                                continue;
                            }
                            List<Integer> STA_WORK_CU1 = new ArrayList<Integer>() {{
                                add(101);add(102);add(104);add(105);add(107);add(108);add(118);add(119);add(122);
                            }};
                            List<Integer> STA_WORK_CU2 = new ArrayList<Integer>() {{
                                add(110);add(111);add(113);add(114);add(116);add(117);add(120);add(121);add(122);add(123);
                            }};
                            if (basRgv.getRgvNo()==1 && !STA_WORK_CU1.contains(wrkMastSta.getStaStart())){
                                continue;
                            }else if (basRgv.getRgvNo()==2 && !STA_WORK_CU2.contains(wrkMastSta.getStaStart())){
                                continue;
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!basDevp.getEmptyMk().equals("Y")){
                                    continue;
@@ -4064,6 +4088,7 @@
            if (integer==0){
                return;
            }
            boolean signRgv = true;
            for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
                RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
@@ -4077,25 +4102,52 @@
                }

                // 只有当RGV空闲、自动,工位一无物//rgv可用
                if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
                if (!(rgvProtocol.getStatusType() == RgvStatusType.IDLE
                        && rgvProtocol.getModeType() == RgvModeType.AUTO
                        && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
                        && rgvProtocol.getTaskNo1()==0
                        && rgvProtocol.getTaskNo2()==0
                        && rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                        && rgvProtocol.getStatusType2() == RgvStatusType.IDLE
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
                    if (rgvProtocol.getRgvPosI().equals(basRgvMap.getStartRoute())){
                )) {
                    signRgv = false;
                    break;
                }
            }
            if (signRgv){
                for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
                    RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
                    RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                    if (rgvProtocol == null) {
                        continue;
                    }
                    if (rgvProtocol.getRgvNo()==1 && (rgvProtocol.getRgvPosI().equals(101) || rgvProtocol.getRgvPosI().equals(102) )){
                        continue;
                    } else if (rgvProtocol.getRgvNo()==2 && (rgvProtocol.getRgvPosI().equals(116) || rgvProtocol.getRgvPosI().equals(117) ) ){
                    BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
                    if (basRgv == null) {
                        log.error("{}号RGV尚未在数据库进行维护！", rgvSlave.getId());
                        continue;
                    }
                    rgvAvoidanceXY(rgvProtocol.getRgvNo());
                    rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());

                    // 只有当RGV空闲、自动,工位一无物//rgv可用
                    if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
                            && rgvProtocol.getModeType() == RgvModeType.AUTO
                            && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
                            && rgvProtocol.getTaskNo1()==0
                            && rgvProtocol.getTaskNo2()==0
                            && rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                            && rgvProtocol.getStatusType2() == RgvStatusType.IDLE
                    ) {
                        BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
                        if (rgvProtocol.getRgvPosI().equals(basRgvMap.getStartRoute())){
                            continue;
                        }
                        if (rgvProtocol.getRgvNo()==1 && (rgvProtocol.getRgvPosI().equals(101) || rgvProtocol.getRgvPosI().equals(102) )){
                            continue;
                        } else if (rgvProtocol.getRgvNo()==2 && (rgvProtocol.getRgvPosI().equals(116) || rgvProtocol.getRgvPosI().equals(117) ) ){
                            continue;
                        }
                        rgvAvoidanceXY(rgvProtocol.getRgvNo());
                        rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                    }
                }
            }
        }catch (Exception e){