From b8b5b799e8770d29ac0a5b8530c468d74173c487 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 03 一月 2025 23:22:53 +0800
Subject: [PATCH] 1、手动生成李赛克文件功能已完成、待联调 2、对接除膜机，调整对应的交互 3、中空两条线新增空闲信号，优先李赛克线优先 4、fixbug:指定工程后增加版图id排序，优先炉号从小到大，版序从小到大
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/GlassInfoMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/GlassInfoMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/GlassInfoMapper.xml
index b1952d3..5d27b6a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/GlassInfoMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/GlassInfoMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.glassinfo.mapper.GlassInfoMapper">
- <select id="listBySize" resultType="com.mes.glassinfo.entity.GlassInfo">
+ <select id="listBySize" resultType="com.mes.glassinfo.entity.dto.HollowGlassInfoDTO">
with glass_list as (
SELECT flow_card_id,
glass_type,
@@ -22,9 +22,10 @@
FROM glass_info
where engineer_id = #{engineerId}
)
- select *
- from glass_list
- order by flow_card_id, height desc, width desc, tempering_layout_id, tempering_feed_sequence
+ select row_number()
+ over (order by flow_card_id, height desc, width desc, tempering_layout_id, tempering_feed_sequence) as rn,
+ t.*
+ from glass_list t
</select>
</mapper>
--
Gitblit v1.8.0