From 9ac149efc825b9237d5e483d63dd15604f0bc30b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:32 +0800
Subject: [PATCH] 1、切割识别界面提供原片尺寸。 2、fixbug：当工程下的版图切割完毕后，界面显示工程号+最大版序+1bug 3、系统参数配置：新增系统参数配置，存入redis，方便后续各个模块调用。后续工作：将各个模块的配置参数由配置文件调整为数据库记录。
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 386c8aa..33749f5 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
@@ -4,7 +4,9 @@
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;
@@ -69,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) {
@@ -83,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) {
@@ -149,11 +152,19 @@
}
@Override
- public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
- 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);
+ public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
+ List<LoadGlassInfo> glassInfos = null;
+ glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
+ .select("IFNULL(b.state, 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(type) AS state 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