From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务，占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index cac7777..ece4d93 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -77,14 +77,16 @@
.eq(HollowGlassRelationInfo::getWidth, width)
.eq(HollowGlassRelationInfo::getHeight, height)
.eq(HollowGlassRelationInfo::getLayer, layer)
- .isNull(HollowGlassRelationInfo::getTemperingLayoutId)
- .isNull(HollowGlassRelationInfo::getTemperingFeedSequence)
+ .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW)
.orderByAsc(HollowGlassRelationInfo::getHollowSequence)
.last("limit 1")
);
}
HollowBigStorageCageDetails hollowDetails = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot()).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
+ .eq(HollowBigStorageCageDetails::getFlowCardId, relationInfoOne.getFlowCardId())
+ .eq(HollowBigStorageCageDetails::getLayer, layer)
+ .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot())
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
.orderByDesc(HollowBigStorageCageDetails::getSequence).last("limit 1"));
HollowBigStorageCage storageCage = null;
if (null == hollowDetails) {
--
Gitblit v1.8.0