#

zjj

2024-07-31 8941629b61157a606bd73ab04cd9fefd75ed6fc0

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

@@ -296,9 +296,11 @@
                if (rgvComplete){
                    rgvThread.setPakMk(true);
                }
                WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
                if (!Cools.isEmpty(wrkMastSta)){
                List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", rgvProtocol.getTaskNo1()));
                if (!Cools.isEmpty(wrkMastStas) || wrkMastStas.size()<=0){
                    WrkMastSta wrkMastSta = wrkMastStas.get(0);
                    wrkMastSta.setWrkSts(3);
                    wrkMastSta.setBignTime(new Date());
                    wrkMastStaMapper.updateById(wrkMastSta);
                }
            }
@@ -486,20 +488,27 @@
                return;
            }
            // 只有当RGV空闲、自动,工位一无物//rgv可用
            if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
            if (rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                    && rgvProtocol.getModeType() == RgvModeType.AUTO
                    && rgvProtocol.getLoaded1()==0
                    && rgvProtocol.getTaskNo1() == 0
                    && rgvThread.isPakMk()
            ) {
                List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>());
                Integer selectCount = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts", 3).ne("wrk_sts", 0));
                if (selectCount>0){
                    log.error("存在执行RGV中任务，但是小车状态空闲！！！");
                    return;
                }

                List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts",0));
                for (WrkMastSta wrkMastSta : wrkMastStaList){
                    if (wrkMastSta.getType()!=0 || wrkMastSta.getWrkType()!=3){//1:满版   3：取放
                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3){//1:满版   3：取放
                        continue;
                    }
                    boolean sign = rgvTakeFullAll(1, wrkMastSta); //命令下发
                    if (sign){
                        wrkMastSta.setWrkSts(1);
                        wrkMastSta.setUpdateTime(new Date());
                        wrkMastStaMapper.updateById(wrkMastSta);
                    } else {
                        log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());