From 8db5b45c853fe5e49f2bca9047ea63e739cb8d79 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 25 五月 2024 08:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 f94df84..225e002 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
@@ -160,6 +160,27 @@
 //
 //    }
 
+    @Override
+    public List<GlassInfo>  DirectConnection(){
+        LambdaQueryWrapper<GlassInfo> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.select(GlassInfo::getFlowCardId,
+                GlassInfo::getGlassId,
+                GlassInfo::getTemperingLayoutId,
+                GlassInfo::getTemperingFeedSequence)
+                .notInSql(GlassInfo::getGlassId, "SELECT glass_id FROM down_glass_info")
+                .orderByAsc(GlassInfo::getTemperingLayoutId)
+                .orderByDesc(GlassInfo::getTemperingFeedSequence)
+                .last("LIMIT 1");
+
+        // 鏌ヨ GlassInfo 琛�
+        log.info("鐩撮�氭煡璇�");
+        return glassInfoMapper.selectList(queryWrapper2);
+
+    };
+
+
+
+
 
     @Override
     public List<DownStorageCageDetails> CacheOut1(int start, int end) {

--
Gitblit v1.8.0