From 211cd083bc9fc1871779802650dfe0e607d8ca77 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 10 五月 2024 08:25:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index d3d0768..f451e50 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -143,7 +143,7 @@
.eq(EdgStorageCageDetails::getGlassId,glassId)
);
List<EdgStorageCageDetails> listEdgStorageCageDetails= baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .lt(EdgStorageCageDetails::getState,200)
+ .eq(EdgStorageCageDetails::getState,100)
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
);
EdgStorageCageDetails minTemperingLayoutId=new EdgStorageCageDetails();
@@ -151,8 +151,9 @@
minTemperingLayoutId=listEdgStorageCageDetails.get(0);
}
EdgStorageCageDetails result=new EdgStorageCageDetails();
+ boolean a=minTemperingLayoutId!=null;
if(edgStorageCageDetails!=null&&minTemperingLayoutId!=null){
- result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
+ List <EdgStorageCageDetails> list= edgStorageCageMapper.selectJoinList(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
.selectAll(EdgStorageCageDetails.class)
.leftJoin(EdgStorageCageDetails.class,on->on
.eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
@@ -164,6 +165,9 @@
.le(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId()+poor)
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
);
+ if(!list.isEmpty()){
+ result=list.get(0);
+ }
}
if (result==null){
--
Gitblit v1.8.0