From 5292a401bc26ad177ff5005787429ce036e6457f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 13:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index a6b68f5..5445669 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/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)) {
--
Gitblit v1.8.0