Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-11-03 c86986fc9dd31522778e0b9893622ddcd882de3e

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

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