*

L

2025-07-17 de364ecdcbee20a85e1e80025f8f686e359e88ef

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

@@ -93,9 +93,9 @@
    @Autowired
    private WrkMastStaMapper wrkMastStaMapper;
    @Autowired
    private BasRgvMapMapper basRgvMapMapper;
    @Autowired
    private RgvOneSignMapper rgvOneSignMapper;
    @Autowired
    private BasRgvMapService basRgvMapService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -1310,7 +1310,11 @@
                log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
//            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
//                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y") && staDetl.getWrkNo().equals(wrkMast.getWrkNo())) {
//                flag = true;
//            }
            if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y") && staDetl.getWrkNo().equals(wrkMast.getWrkNo())) {
                flag = true;
            }
@@ -3552,7 +3556,13 @@
                            if (!rgvComplete){
                                log.error("小车复位失败，小车号{}！",rgvProtocol.getRgvNo());
                            }
                            BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                            RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                            int rgvSignTwoType = 0;
                            if (!Cools.isEmpty(rgvSignTwo)){
                                rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                            }
                            BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                            basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                            rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                            break;
@@ -3630,7 +3640,13 @@
                        }
                        wrkMastSta.setWrkSts(3);
                        wrkMastStaMapper.updateById(wrkMastSta);
                        BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                        RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                        int rgvSignTwoType = 0;
                        if (!Cools.isEmpty(rgvSignTwo)){
                            rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                        }
                        BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                        basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                        rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                    }else if (rgvProtocol.getTaskNo2()!=0 && (rgvProtocol.getStatusType2()==RgvStatusType.WAITING || rgvProtocol.getStatusType2()==RgvStatusType.FETCHWAITING)){
@@ -3639,7 +3655,13 @@
                            if (!rgvComplete){
                                log.error("小车复位失败，小车号{}！",rgvProtocol.getRgvNo());
                            }
                            BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                            RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                            int rgvSignTwoType = 0;
                            if (!Cools.isEmpty(rgvSignTwo)){
                                rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                            }
                            BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                            basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                            rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                            break;
@@ -3688,7 +3710,13 @@
                        }
                        wrkMastSta.setWrkSts(3);
                        wrkMastStaMapper.updateById(wrkMastSta);
                        BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                        RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                        int rgvSignTwoType = 0;
                        if (!Cools.isEmpty(rgvSignTwo)){
                            rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                        }
                        BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                        basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                        rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                    }else {
@@ -3840,7 +3868,13 @@
                        && rgvProtocol.getLoaded1()==0
                        && rgvProtocol.getTaskNo1()==0 && rgvProtocol.getTaskNo2()==0
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(basRgv.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(basRgv.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -3955,7 +3989,13 @@
                    && rgvProtocol.getLoaded1()==0
                    && rgvProtocol.getTaskNo1()==0 && rgvProtocol.getTaskNo2()==0
            ) {
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(basRgv.getRgvNo());

                RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                int rgvSignTwoType = 0;
                if (!Cools.isEmpty(rgvSignTwo)){
                    rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                }
                BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(basRgv.getRgvNo(),rgvSignTwoType);
                if (basRgvMap == null) {
                    log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                    return false;
@@ -4037,7 +4077,13 @@
                        && rgvProtocol.getLoaded1()==1
                        && rgvProtocol.getTaskNo1()!=0 && rgvProtocol.getTaskNo2()==0
            ) {// 只有当RGV空闲、自动,工位一有物  有工作号//rgv可用
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(basRgv.getRgvNo());

                RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                int rgvSignTwoType = 0;
                if (!Cools.isEmpty(rgvSignTwo)){
                    rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                }
                BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(basRgv.getRgvNo(),rgvSignTwoType);
                if (basRgvMap == null) {
                    log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                    return false;
@@ -4124,7 +4170,13 @@
                        && rgvProtocol.getTaskNo2()==0
                        && (rgvProtocol.getLoaded2()==3  || rgvProtocol.getLoaded2()==1 || rgvProtocol.getLoaded2()==4)////0 无物；1 一层无物二层有物 （只能拆叠） ；2一层有物二层无物() ；3  1、2层都有物  4：（）只允许拆盘
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(basRgv.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -4232,7 +4284,13 @@
                    && rgvProtocol.getLoaded1()==1
                    && rgvProtocol.getTaskNo1()!=0 && rgvProtocol.getTaskNo2()==0
            ) {
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                int rgvSignTwoType = 0;
                if (!Cools.isEmpty(rgvSignTwo)){
                    rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                }
                BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                if (basRgvMap == null) {
                    log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                    return false;
@@ -4345,7 +4403,13 @@
                        && rgvProtocol.getTaskNo2()==0
                        &&  (rgvProtocol.getLoaded2()==2  || rgvProtocol.getLoaded2()==3 ) ////0 无物；1 一层无物二层有物  ；2一层有物二层无物 （只能满放）；3  1、2层都有物  4：（）只允许拆盘
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -4453,7 +4517,13 @@
                        && rgvProtocol.getTaskNo2()==0
                        &&  (rgvProtocol.getLoaded2()==0  || rgvProtocol.getLoaded2()==1 ) //现场修改：叠盘机，////0 无物；1 一层无物二层有物（只能拆叠）   ；2一层有物二层无物 （只能满放）；3  1、2层都有物  4：（）只允许拆盘
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -4549,7 +4619,13 @@
                    && rgvProtocol.getLoaded1() == 0
                    && rgvProtocol.getTaskNo1()==0 && rgvProtocol.getTaskNo2()==0
            ) {
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                int rgvSignTwoType = 0;
                if (!Cools.isEmpty(rgvSignTwo)){
                    rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                }
                BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                if (basRgvMap == null) {
                    log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                    return false;
@@ -4638,7 +4714,13 @@
                        && rgvProtocol.getTaskNo2()==0
                        &&  rgvProtocol.getLoaded2()==0  //现场修改：叠盘机，////0 无物；1 一层无物二层有物（只能拆叠）   ；2一层有物二层无物 （只能满放）；3  1、2层都有物  4：（）只允许拆盘
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -4732,7 +4814,13 @@
                        || (rgvProtocol.getTaskNo1()>0 && rgvProtocol.getLoaded1()==1))
                        && rgvProtocol.getTaskNo2()==0
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvProtocol.getRgvNo(),rgvSignTwoType);
                    if (basRgvMap == null) {
                        log.error("{}号RGV尚未在数据库地图中进行维护！", rgvProtocol.getRgvNo());
                        return false;
@@ -4925,7 +5013,13 @@
                        || (rgvProtocol.getTaskNo1()>0 && rgvProtocol.getLoaded1()==1))
                        && rgvProtocol.getTaskNo2()==0
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvSlave.getId());

                    RgvOneSign rgvSignTwo = rgvOneSignMapper.selectOneSign("rgvTwo");
                    int rgvSignTwoType = 0;
                    if (!Cools.isEmpty(rgvSignTwo)){
                        rgvSignTwoType = rgvSignTwo.getRgvOneSign();
                    }
                    BasRgvMap basRgvMap = basRgvMapService.selectByIdSignTwo(rgvSlave.getId(),rgvSignTwoType);
                    basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                    rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                }
@@ -4945,7 +5039,6 @@
        }
        if (rgvId==1){
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -4968,7 +5061,6 @@
            }
        }else {
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -5000,7 +5092,6 @@
        }
        if (rgvId==2){
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -5027,7 +5118,6 @@
            }
        }else {
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -5064,7 +5154,6 @@
        }
        if (rgvId==1){
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -5087,7 +5176,6 @@
            }
        }else {
            try{
                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                //  命令下发区 --------------------------------------------------------------------------
                RgvCommand rgvCommand = new RgvCommand();
                rgvCommand.setRgvNo(rgvId); // RGV编号
@@ -5363,7 +5451,7 @@
        if (rgvOpen){
            return true;
        }
        if (basRgvMapCurrent.getRgvNo()>20){
        if (basRgvMapCurrent.getRgvNo()>2){
            return true;
        }
//        List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
@@ -5373,16 +5461,17 @@
//            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(staEnd, staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
            Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //获取合并干涉项
            basRgvMapCurrent.setLockEndRoute(fallMerge);
            basRgvMapMapper.updateById(basRgvMapCurrent);

            basRgvMapService.updateById(basRgvMapCurrent);

            //更新另一台小车地图
            Integer rgvNoOther = basRgvMapCurrent.getRgvNoOther();
            BasRgvMap basRgvMapOther = basRgvMapMapper.selectById(rgvNoOther);
            BasRgvMap basRgvMapOther = basRgvMapService.selectById(rgvNoOther);
            List<Integer> integers = RouteUtils.RouteMapCurrentFar(fallMerge, basRgvMapCurrent.getLockStartRoute());
            Integer lockEndRoute = RouteUtils.RouteMapOtherFarStnNo(integers, basRgvMapCurrent.getLockStartRoute());//另一台小车可活动最远位置
            Integer lockEndRouteL = RouteUtils.RouteIndexFarMasL(rgvNoOther, lockEndRoute);//另一台小车可活动最远位置
            basRgvMapOther.setEndRoute(lockEndRouteL);
            basRgvMapMapper.updateById(basRgvMapOther);
            basRgvMapService.updateById(basRgvMapOther);
            return true;
        }catch (Exception e){
            log.error("小车地图更新出错！");