From 86dbb4e751bb5c4990d082a070d409ee75ed3745 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 12 六月 2024 09:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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