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/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 7 ++++++-
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 4 ++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index d5e377e..94ca28e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -352,6 +352,7 @@
Integer d06OutState = s7DataWLExtraTwo.getD06SlotState();
//鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
//涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
+ log.info("褰撳墠璁惧涓猴細{},涓�鍙疯澶囦换鍔′俊鎭細{}锛屼簩鍙疯澶囦换鍔′俊鎭細{}锛宒06浠诲姟淇℃伅锛歿}", deviceId, s7DataWLOne, s7DataWLTwo, d06OutState);
if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
log.info("璁惧{}:A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", deviceId, oneOutState, oneOutState);
return Boolean.FALSE;
@@ -379,8 +380,12 @@
cell = Const.TWO_OUT_TARGET_POSITION;
} else if (Const.OUT_FREE.equals(oneOutState)) {
cell = Const.ONE_OUT_TARGET_POSITION;
- } else {
+ } else if (Const.OUT_BUSY.equals(twoOutState)) {
cell = Const.TWO_OUT_TARGET_POSITION;
+ }else if(Const.OUT_BUSY.equals(oneOutState)){
+ cell = Const.ONE_OUT_TARGET_POSITION;
+ }else{
+ return Boolean.FALSE;
}
}
log.info("{}绾胯矾璁＄畻瀹屾垚锛歿}", deviceId, cell);
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