From 22fb46f2db1714a6b450b353669d26908884653f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 24 十月 2024 10:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 170123e..f30b7d0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -607,27 +607,27 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
List<String> glassIds1 = new ArrayList<>();
List<String> glassIds2 = new ArrayList<>();
-// for (int i = 1; i <= 6; i++) {
-// String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
-// if (StringUtils.isNotEmpty(line1GlassId)) {
-// glassIds1.add(line1GlassId);
-// }
-// String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
-// if (StringUtils.isNotEmpty(line2GlassId)) {
-// glassIds1.add(line2GlassId);
-// }
-// }
+ for (int i = 1; i <= 6; i++) {
+ String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
+ if (StringUtils.isNotEmpty(line1GlassId)) {
+ glassIds1.add(line1GlassId);
+ }
+ String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
+ if (StringUtils.isNotEmpty(line2GlassId)) {
+ glassIds2.add(line2GlassId);
+ }
+ }
List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
.eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
);
List<BigStorageCageFeedTask> bigStorageCageFeedTasks2 = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
);
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)&& glassIds1 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1) && CollectionUtils.isNotEmpty(glassIds1)) {
List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds1::contains)
@@ -640,7 +640,7 @@
.set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
);
}
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2)&& glassIds2 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2) && CollectionUtils.isNotEmpty(glassIds2)) {
List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds2::contains)
@@ -656,7 +656,7 @@
if (CollectionUtils.isEmpty(glassIds1)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getLine,Const.A09_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.gt(BigStorageCageFeedTask::getTargetSlot, 0)
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
@@ -666,7 +666,7 @@
if (CollectionUtils.isEmpty(glassIds2)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getLine,Const.A10_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.gt(BigStorageCageFeedTask::getTargetSlot, 0)
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
@@ -679,6 +679,21 @@
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
+ //鍒ゆ柇姝ょ幓鐠冩槸鍦ㄧ鍐呮垨宸茬敓鎴愯繘鐗囦换鍔�
+ BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .eq(BigStorageCageFeedTask::getGlassId, glassId)
+ );
+ BigStorageCageDetails bigStorageCageDetails = bigStorageCageDetailsService.getOne(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getGlassId, glassId)
+ .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ );
+ if (bigStorageCageFeedTask != null || bigStorageCageDetails != null) {
+ log.info("姝ょ幓鐠冨瓨浠诲姟鎴栧凡鍦ㄧ鍐�");
+ return Boolean.TRUE;
+ }
//1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
List<EdgGlassTaskInfo> edgGlassTaskInfoList;
edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
--
Gitblit v1.8.0