Merge remote-tracking branch 'origin/master'

ZengTao

2025-10-31 5292a401bc26ad177ff5005787429ce036e6457f

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -912,6 +912,10 @@
            log.info("当前存在进片任务，结束");
            return;
        }
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())){
            log.info("当前存在进片任务请求，结束本次大笼子调度");
            return;
        }
        //有请求信号
        List<String> glassIdList = hollowGlassQueueInfoService.queryNeedInCarGlass();
        if (CollectionUtil.isEmpty(glassIdList)) {