From edf8d8a22fb096faaaf2ddbb9f07f2e4a9edad25 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 12 八月 2025 14:04:21 +0800
Subject: [PATCH] 1、大理片笼内玻璃到齐判断为笼内实际玻璃数据与玻璃小片数作比较，相等视为到齐。排除破损表的干涉
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index be58abc..996634b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -60,30 +60,26 @@
</resultMap>
<select id="temperingIsAllByTemperingLayoutId" resultMap="temperingLayoutDTO">
- SELECT T2.*
+ SELECT T.*
FROM (
- SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, COUNT(TEMPERING_FEED_SEQUENCE) AS COUNT
+ SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, COUNT(distinct TEMPERING_FEED_SEQUENCE) AS COUNT
FROM BIG_STORAGE_CAGE_DETAILS
WHERE STATE = 100
and ENGINEER_ID = #{engineerId}
AND TEMPERING_LAYOUT_ID = #{temperingLayoutId}
GROUP BY ENGINEER_ID, TEMPERING_LAYOUT_ID
- ) T2
- INNER JOIN (SELECT T.ENGINEER_ID,
- T.TEMPERING_LAYOUT_ID,
- COUNT(T.TEMPERING_FEED_SEQUENCE) AS COUNT
- FROM GLASS_INFO T
- LEFT JOIN DAMAGE T1
- ON T.ENGINEER_ID = T1.ENGINEER_ID
- AND T.GLASS_ID = T1.GLASS_ID
- AND T1.TYPE in (8, 9)
- WHERE T1.GLASS_ID IS NULL
- and T.ENGINEER_ID = #{engineerId}
- AND T.TEMPERING_LAYOUT_ID = #{temperingLayoutId}
- GROUP BY T.ENGINEER_ID,
- T.TEMPERING_LAYOUT_ID) T3 ON T2.ENGINEER_ID = T3.ENGINEER_ID
- AND T2.TEMPERING_LAYOUT_ID = T3.TEMPERING_LAYOUT_ID
- AND T2.COUNT = T3.COUNT
+ ) T
+ INNER JOIN (SELECT ENGINEER_ID,
+ TEMPERING_LAYOUT_ID,
+ COUNT(distinct TEMPERING_FEED_SEQUENCE) AS COUNT
+ FROM GLASS_INFO
+ WHERE ENGINEER_ID = #{engineerId}
+ AND TEMPERING_LAYOUT_ID = #{temperingLayoutId}
+ GROUP BY ENGINEER_ID,
+ TEMPERING_LAYOUT_ID) T1
+ ON T.ENGINEER_ID = T1.ENGINEER_ID
+ AND T.TEMPERING_LAYOUT_ID = T1.TEMPERING_LAYOUT_ID
+ AND T.COUNT = T1.COUNT
</select>
<select id="temperingIsAll" resultMap="temperingLayoutDTO">
@@ -93,14 +89,14 @@
T.TEMPERING_LAYOUT_ID,
COUNT(T.TEMPERING_FEED_SEQUENCE) AS COUNT
FROM GLASS_INFO T
- LEFT JOIN DAMAGE T1
- ON T.ENGINEER_ID = T1.ENGINEER_ID
- AND T.GLASS_ID = T1.GLASS_ID
- AND (T1.TYPE = 8
- OR T1.TYPE = 9)
+ LEFT JOIN DAMAGE T1
+ ON T.ENGINEER_ID = T1.ENGINEER_ID
+ AND T.GLASS_ID = T1.GLASS_ID
+ AND (T1.TYPE = 8
+ OR T1.TYPE = 9)
WHERE T1.GLASS_ID IS NULL
GROUP BY T.ENGINEER_ID,
- T.TEMPERING_LAYOUT_ID
+ T.TEMPERING_LAYOUT_ID
) T2
INNER JOIN (SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, COUNT(TEMPERING_FEED_SEQUENCE) AS COUNT
FROM BIG_STORAGE_CAGE_DETAILS
@@ -296,8 +292,8 @@
<select id="querybigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
select bsc.device_id, bsc.slot, count(bscd.glass_id) as count
from big_storage_cage bsc
- left join big_storage_cage_details bscd
- on bsc.slot = bscd.slot and bscd.state in (100, 102, 103, 104)
+ left join big_storage_cage_details bscd
+ on bsc.slot = bscd.slot and bscd.state in (100, 102, 103, 104)
group by bsc.device_id, bsc.slot
order by bsc.device_id, bsc.slot
</select>
--
Gitblit v1.8.0