From 9b2e6042369b61ef267c1e42ae1f3c6b324c27d0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 19 六月 2024 08:12:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index 0696121..170a2b0 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
+import com.mes.common.config.Const;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
@@ -110,6 +111,7 @@
return downStorageCageDetailsMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCageDetails.class) // 浣跨敤 JoinWrappers.lambda 鍒涘缓鑱斿悎鏌ヨ
.selectAll(DownStorageCageDetails.class) // 閫夋嫨鎵�鏈夊瓧娈�
.eq(DownStorageCage::getSlot, DownStorageCageDetails::getSlot) // 璁剧疆鍏宠仈鏉′欢
+ .eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN)
.orderByAsc(DownStorageCage::getSlot) // 鎸� slot 瀛楁鍗囧簭鎺掑簭
);
}
@@ -207,6 +209,7 @@
anotherQueryWrapper.orderByAsc(DownStorageCageDetails::getTemperingLayoutId);
anotherQueryWrapper.orderByDesc(DownStorageCageDetails::getTemperingFeedSequence);
anotherQueryWrapper.in(DownStorageCageDetails::getFlowCardId, flowCardIds);
+ anotherQueryWrapper.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN);
anotherQueryWrapper.last("LIMIT 1");
return downStorageCageDetailsMapper.selectList(anotherQueryWrapper);
} else {
@@ -246,6 +249,7 @@
LambdaQueryWrapper<DownStorageCageDetails> cageDetailsQueryWrapper = Wrappers.lambdaQuery();
cageDetailsQueryWrapper.in(DownStorageCageDetails::getGlassId, glassIds);
cageDetailsQueryWrapper.in(DownStorageCageDetails::getFlowCardId, flowCardIds);
+ cageDetailsQueryWrapper.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN);
log.info("鎸夌収娴佺▼鍗＄殑鐗堝浘id 鐗堝浘鐗囧簭鍑�");
// Step 4: 鏌ヨ down_storage_cage_details 琛ㄥ苟杩斿洖缁撴灉
--
Gitblit v1.8.0