#改造

cpT

2025-06-22 87b052cbd5bb44bf90ac4e9c4aeaf1cdcf5acf63

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

@@ -80,8 +80,8 @@
    private boolean reportSwitchAuto;

    /*
    * 验证许可证是否有效
    * */
     * 验证许可证是否有效
     * */
    public synchronized boolean licenseVerify() {
        try{
//            if (true) {
@@ -374,6 +374,7 @@
                                    && rgvProtocol.modeType == RgvModeType.AUTO
                                    && (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
                                    && rgvProtocol.getTaskNo1() == 0
                                    && rgvProtocol.getRgvPosInt() != 0
                                    && rgvProtocol.getAlarm() == 0) {
                                BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getSourceStaNo()));
                                if (basDevpPosition.getPlcPosition()>rgvProtocol.getRgvPos()){
@@ -620,9 +621,6 @@
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4, rgvCommand))) {
                        //
                        log.error("RGV取消命令下发失败，RGV号={}，任务数据={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
//                        wrkMast.setLogErrTime(new Date());
//                        wrkMast.setLogErrMemo("RGV取消命令下发失败，RGV号={"+rgvProtocol.getRgvNo()+"}===>跳过");
//                        wrkMastService.updateById(wrkMast);
                        continue;
                    }
                    log.info("RGV取消命令下发成功，RGV号={}，任务数据={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
@@ -635,10 +633,9 @@

                    Date now = new Date();
                    wrkMast.setWrkSts(1L);
                    wrkMast.setRgvNo(null);
                    wrkMast.setRgvNo(0);
                    wrkMast.setAppeTime(now);
                    wrkMast.setLogErrTime(now);
                    wrkMast.setRgvNo(null);

                    wrkMast.setLogErrMemo("RGV申请取消任务，RGV号={"+rgvProtocol.getRgvNo()+"}，取消时间："+now);