From 29545639b4a4e9d21b8b2ff0ad4803d26f5afff0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 08:34:18 +0800
Subject: [PATCH] 1、erp地址修改为义乌erp 2、fixbug:中空李赛克出片问题 3、大屏显示字段显示异常

---
 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