From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
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