From b99f6d3e4022f35803ffb8a325d79769228378c6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 27 二月 2025 09:54:13 +0800
Subject: [PATCH] 去除小片实体类多余字段
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 06dc5bb..19d4459 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -3,12 +3,16 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.entity.LoadGlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.github.yulichang.base.MPJBaseServiceImpl;
import javax.annotation.Resource;
import java.util.List;
@@ -22,10 +26,12 @@
* @since 2024-04-07
*/
@Service
-@DS("salve_hangzhoumes")
+@DS("salve_northGlassMes")
public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
@Resource
TemperingGlassInfoMapper temperingMapper;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
@Override
public List<TemperingGlassInfo> selectWaitingGlass() {
@@ -65,7 +71,8 @@
public List<TemperingGlassInfo> selectOutGlass() {
//鑾峰彇鍑虹倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
- wrap.select("Top 1 *").eq("state", 3);
+ wrap.select("Top 1 *").eq("state", 4)
+ .orderByDesc("id");
TemperingGlassInfo glass = temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
if (glass != null) {
@@ -79,7 +86,7 @@
//鑾峰彇杩囨棆杞彴鏈�澶х殑閽㈠寲鐗堝浘id
QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
wapper.select("Top 1 *").eq("state", 4)
- .orderByDesc("tempering_layout_id,engineer_id");
+ .orderByDesc("id");
//鏍规嵁鏈�澶х殑鐗堝浘id鏄剧ず閽㈠寲鍚庣殑鐗堝浘淇℃伅
TemperingGlassInfo glassinfo = temperingMapper.selectOne(wapper);
if (glassinfo == null) {
@@ -133,4 +140,31 @@
}
return result;
}
+
+ @Override
+ public GlassInfo selectTempering(GlassInfo glassInfo) {
+
+ QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("max(tempering_layout_id)as id")
+ .eq("engineer_id", glassInfo.getEngineerId());
+
+ return glassInfoMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
+ List<LoadGlassInfo> glassInfos = null;
+ glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
+ .select("IFNULL(b.status, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
+ .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" +
+ "ON t.glass_id = b.glass_id")
+ .eq("engineer_id", glassInfo.getEngineerId())
+ .eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
+ return glassInfos;
+// QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+// wrapper.eq("engineer_id", glassInfo.getEngineerId())
+// .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
+// .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
+// return glassInfoMapper.selectList(wrapper);
+ }
}
--
Gitblit v1.8.0