From 01b07fdef6c2117c3672b0d90b8b2f2218bdd659 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 31 十月 2025 09:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 a49c7f9..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);
@@ -428,7 +433,7 @@
if (null == edgStorageCageDetails) {
// 鑾峰彇鍘嗗彶琛ㄤ腑涓婃浠诲姟鏈�鍚庝竴鐗囧昂瀵�
EdgStorageDeviceTaskHistory edgeData = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, cell)
+ .eq(EdgStorageDeviceTaskHistory::getEndCell, cell)
.in(EdgStorageDeviceTaskHistory::getTaskType, Const.GLASS_CACHE_TYPE_OUT, Const.GLASS_CACHE_TYPE_THROUGH)
.orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1"));
log.info("{}鑾峰彇涓婃浠诲姟淇℃伅锛歿}", deviceId, edgeData);
--
Gitblit v1.8.0