#

whycq

2024-12-27 6048b67716ebce38c553dd722a31c23072547ee4

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

@@ -181,8 +181,8 @@
            if (wrkMasts.isEmpty()){
                return;
            }
            long differenceInSeconds = TimeCalculatorUtils.differenceInSeconds(wrkMasts.get(0).getModiTime(), new Date());
            if (differenceInSeconds<=5){
            long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(wrkMasts.get(0).getModiTime(), new Date());
            if (differenceInSeconds<=100){
                return;
            }

@@ -236,12 +236,20 @@
        runRgv:
        for (List<WrkMast> wrkMastList : wrkMastLists){
            for (WrkMast wrkMast: wrkMastList){

                log.error("存在任务，RGV号={}，任务数据={}", rgvId, JSON.toJSON(wrkMast));

                rgvId++;
                BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", 1L));
                BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
                RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                if (rgvProtocol == null){
                    continue ;
                }
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts", 2L));
                if (!wrkMasts.isEmpty()){
                    continue ;
                }
                if (rgvProtocol != null
                        && rgvProtocol.modeType == RgvModeType.AUTO
                        && (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
@@ -276,6 +284,7 @@
                    break runRgv;
                }
            }

        }
    }