From 8f8dfc2652f11931a3ee953a434233fdf71149d2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 12 六月 2024 09:32:13 +0800
Subject: [PATCH] 增加接口的返回是否成功,清理钢化文件

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
index 592580c..0e8c654 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
@@ -53,12 +53,15 @@
     }
 
     @Override
-    public TemperingGlassInfo selectOverGlass() {
-        //鑾峰彇杩囨棆杞彴鐨勭幓鐠�
+    public List<TemperingGlassInfo> selectOverGlass() {
+        //鑾峰彇杩囨棆杞彴鏈�澶х殑閽㈠寲鐗堝浘id
         QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
         wapper.select("top 1 *").eq("state", 4)
-                .orderByAsc("tempering_layout_id")
-                .orderByDesc("tempering_feed_sequence");
-        return temperingMapper.selectOne(wapper);
+                .orderByDesc("tempering_layout_id");
+        //鏍规嵁鏈�澶х殑鐗堝浘id鏄剧ず閽㈠寲鍚庣殑鐗堝浘淇℃伅
+        TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
+        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId());
+        return  temperingMapper.selectList(wrapper);
     }
 }

--
Gitblit v1.8.0