From 4bef3c1a0dd435b4c6bf8f8429db67dac027ed6b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 十二月 2025 14:48:17 +0800
Subject: [PATCH] 1、中空创建任务查询界面添加当总数量不等于已配对数时高亮显示
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 0fb1f76..a9fd872 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
@@ -993,7 +993,7 @@
damage.setWorkingProcedure("纾ㄨ竟");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
}
@@ -1018,7 +1018,7 @@
damage.setWorkingProcedure("涓┖鍓�");
damage.setRemark("杩涚鍚庡崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
slotList.add(item.getStartSlot());
@@ -1079,7 +1079,7 @@
}
private List<HollowGlassQueueInfo> computeOutHollowQueue(List<HollowGlassQueueInfo> queueInfoList, HollowGlassOutRelationInfo hollowGlassOutRelationInfo) {
- if (CollectionUtil.isNotEmpty(queueInfoList)) {
+ if (CollectionUtil.isEmpty(queueInfoList)) {
return new ArrayList<>();
}
//浠诲姟涓哄己鍒讹紝鍙洿鎺ヨ繑鍥炲師鏈夌殑闃熷垪
@@ -1093,11 +1093,6 @@
List<HollowGlassQueueInfo> resultQueue = new ArrayList<>();
for (List<HollowGlassQueueInfo> items : gridGroups.values()) {
- // 鎯呭喌1锛氭牸瀛愬唴鍙湁涓�涓暟鎹笖鏈厤瀵� - 杩囨护鎺�
- if (items.size() == 1 && 0 == items.get(0).getSlot()) {
- continue;
- }
-
// 鎯呭喌2锛氭牸瀛愬唴鍏ㄩ儴涓烘湭閰嶅鐨勬暟鎹� - 杩囨护鎺�
boolean allUnpaired = items.stream().noneMatch(e -> e.getIsPair() == 1);
if (allUnpaired) {
@@ -1106,6 +1101,7 @@
// 鍚﹀垯淇濈暀杩欎釜鏍煎瓙鍐呯殑鎵�鏈夋暟鎹�
resultQueue.addAll(items);
}
+ Collections.sort(resultQueue, Comparator.comparing(HollowGlassQueueInfo::getId));
return resultQueue;
}
--
Gitblit v1.8.0