From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮：清除笼内状态为0的玻璃数据，并将格子尺寸恢复到初始状态。 2、历史任务按钮：按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时，仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱，当数量小于总层数时，增加是否同一对玻璃的判断，避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 4b228ec..a292646 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
@@ -805,14 +805,22 @@
if (1 != isForce) {
if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
if (tempList.size() <= totalLayer) {
- bigStorageCageTaskList = tempList;
+ int tempSequence = list.get(0).getHollowSequence();
+ List<BigStorageCageTask> resultList = new ArrayList<>();
+ for (int i = 0; i < tempList.size(); i++) {
+ if (tempSequence == list.get(i).getHollowSequence()) {
+ resultList.add(tempList.get(i));
+ } else {
+ break;
+ }
+ }
+ bigStorageCageTaskList = resultList;
} else {
int remainCount = tempList.size() % totalLayer;
bigStorageCageTaskList = tempList.subList(0, tempList.size() - remainCount);
}
}
}
-
List<String> glassIds = bigStorageCageTaskList.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
int glassCount = bigStorageCageTaskList.size();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
--
Gitblit v1.8.0