From 3123dbd3a5be75999f368fbe4aa722e3877074ab Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 14 六月 2024 15:52:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
similarity index 65%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
index 592580c..01ed8a7 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
-import com.mes.temperingglass.mapper.TemperingMapper;
import com.mes.temperingglass.service.TemperingAgoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.yulichang.base.MPJBaseServiceImpl;
+
import java.util.List;
/**
@@ -23,7 +23,7 @@
@DS("salve_hangzhoumes")
public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService {
@Autowired
- TemperingMapper temperingMapper;
+ TemperingGlassInfoMapper temperingMapper;
@Override
public List<TemperingGlassInfo> selectWaitingGlass() {
@@ -35,10 +35,11 @@
}
@Override
- public List<TemperingGlassInfo> selectIntoGlass() {
+ public List<TemperingGlassInfo> selectIntoGlass(int layoutId) {
//鑾峰彇杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.eq("state",2)
+ .eq("tempering_layout_id", layoutId)
.orderByAsc("tempering_layout_id","tempering_feed_sequence");
return temperingMapper.selectList(wrapper);
}
@@ -53,12 +54,24 @@
}
@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);
+ }
+
+ @Override
+ public List<TemperingGlassInfo> selectLayoutId() {
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("distinct tempering_layout_id")
+ .eq("state",2)
+ .orderByAsc("tempering_layout_id");
+ return temperingMapper.selectList(wrapper);
}
}
--
Gitblit v1.8.0