From 11771865457feeb35121435ea2dc089ce186346c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 02 八月 2024 14:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
index 967696b..32bca1a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
@@ -10,7 +10,7 @@
<resultMap id="downGlassInfo" type="com.mes.downworkstation.entity.dto.DownGlassInfoDTO">
<result column="flow_card_id" property="flowCardId"/>
<result column="layer" property="layer"/>
- <result column="count" property="count"/>
+ <result column="racks_number" property="racksNumber"/>
<collection property="glassInfoList" ofType="com.mes.glassinfo.entity.GlassInfo">
<id column="id" property="id"/>
<result column="flow_card_id" property="flowCardId"/>
@@ -38,32 +38,36 @@
order by count desc limit 1
</select>
<select id="queryMaxSequence" resultType="java.lang.Integer">
- SELECT max(sequence) + 1 as sequence
+ SELECT COALESCE(max(sequence) + 1, 0) as sequence
FROM down_glass_info
WHERE flow_card_id = #{flowCardId}
AND layer = #{layer}
</select>
- <select id="queryWorkStationNotIn" resultMap="downGlassInfo">
- SELECT T.*,
- T1.*
- FROM (
- SELECT T.FLOW_CARD_ID,
- T.LAYER,
- COUNT(T.LAYER) AS COUNT
- FROM
- DOWN_GLASS_INFO T
- INNER JOIN DOWN_WORKSTATION T1
- ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
- AND T.LAYER = T1.LAYER
- GROUP BY
- T.FLOW_CARD_ID,
- T.LAYER
- ) T
- INNER JOIN GLASS_INFO T1 ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
- AND T.LAYER = T1.LAYER
- LEFT JOIN DOWN_GLASS_INFO T2 ON T1.GLASS_ID = T2.GLASS_ID
- WHERE T2.GLASS_ID IS NULL
- order by t.count desc
+ <select id="queryWorkStationIsIn" resultMap="downGlassInfo">
+ SELECT
+ T.FLOW_CARD_ID,
+ T.LAYER,
+ T.RACKS_NUMBER
+ <if test="!isDownload">
+ ,T1.*
+ </if>
+ FROM
+ DOWN_WORKSTATION T
+ INNER JOIN GLASS_INFO T1 ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
+ AND T.LAYER = T1.LAYER
+ LEFT JOIN DOWN_GLASS_INFO T2 ON T1.GLASS_ID = T2.GLASS_ID
+ <where>
+ <if test="!isDownload">
+ AND T2.GLASS_ID IS NULL
+ </if>
+ <if test="isDownload">
+ AND T2.GLASS_ID IS not NULL
+ </if>
+ </where>
+ ORDER BY
+ T.RACKS_NUMBER DESC,
+ T1.TEMPERING_LAYOUT_ID,
+ T1.TEMPERING_FEED_SEQUENCE DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0