From 4c1bcfba73c00f44adc5b5b7f1275e24d5e6a901 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 02 九月 2024 14:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index c324ce2..3905579 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -367,11 +367,21 @@
List<Integer> workList = new ArrayList();
if (flag08) {
if (!"2".equals(glassStatus11)) {
- workList.addAll(Const.G11_WORK_STATION);
+ List<Integer> wroklistOne = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G11_WORK_STATION))
+ .stream()
+ .map(DownWorkstation::getWorkstationId)
+ .collect(Collectors.toList());
+ workList.addAll(wroklistOne);
}
} else {
if (!"2".equals(glassStatus06)) {
- workList.addAll(Const.G06_WORK_STATION);
+ List<Integer> wroklistTwo = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G06_WORK_STATION))
+ .stream()
+ .map(DownWorkstation::getWorkstationId)
+ .collect(Collectors.toList());
+ workList.addAll(wroklistTwo);
}
}
List<Integer> workStationAll = Arrays.asList(1, 2, 3, 4, 5, 6);
--
Gitblit v1.8.0