From 66d9a37adfa32014d479ae1e67575d2392084676 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 九月 2025 09:05:51 +0800
Subject: [PATCH] 1、大屏动画修改
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
index 6a7afe3..39488a1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
@@ -4,16 +4,18 @@
<select id="queryFreeDeviceByUsed" resultType="java.lang.Integer">
- SELECT T.DEVICE_ID
+ SELECT
+ T.DEVICE_ID
FROM BIG_STORAGE_CAGE T
LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 8, 9)) T1
ON T.SLOT = T1.SLOT
- WHERE T.MAX_THICKNESS >= #{thickness} AND T.REMAIN_WIDTH = 5000
+ WHERE T.MAX_THICKNESS >= #{thickness} AND T.SLOT_HEIGHT > #{slotHeight}
AND T.ENABLE_STATE = 1
GROUP BY T.DEVICE_ID
+ HAVING COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) > 0
ORDER BY min(T.MAX_THICKNESS),
- COUNT(DISTINCT T1.ENGINEER_ID), COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
- COUNT(DISTINCT T1.SLOT)
+ TRUNCATE(COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID)/9,0), COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID)%9 DESC,
+ FIELD(T.device_id, 5, 4, 3, 2, 1), T.device_id
</select>
<!-- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">-->
@@ -28,4 +30,21 @@
<!-- COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),-->
<!-- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC-->
<!-- </select>-->
+<!-- <select id="queryPieChart" resultType="com.mes.largenscreen.entity.PieChartVO">-->
+<!-- SELECT-->
+<!-- round(sum( CASE WHEN e.station_cell = 5 THEN 1 ELSE 0 END ),2) as oneCompletedQuantity,-->
+<!-- round(sum( CASE WHEN e.station_cell = 5 THEN bscd.width*bscd.height/1000000 ELSE 0 END ),2) as oneCompletedArea,-->
+<!-- round(sum( CASE WHEN e.station_cell = 6 THEN 1 ELSE 0 END ),2) as twoCompletedQuantity,-->
+<!-- round(sum( CASE WHEN e.station_cell = 6 THEN bscd.width*bscd.height/1000000 ELSE 0 END ),2) as twoCompletedArea,-->
+<!-- round(sum( CASE WHEN e.station_cell = 5 and bscd.device_id is null THEN 1 ELSE 0 END ),2) as oneUncompletedQuantity,-->
+<!-- round(sum( CASE WHEN e.station_cell = 5 and bscd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END ),2) as oneUncompletedArea,-->
+<!-- round(sum( CASE WHEN e.station_cell = 6 and bscd.device_id is null THEN 1 ELSE 0 END ),2) as twoUncompletedQuantity,-->
+<!-- round(sum( CASE WHEN e.station_cell = 6 and bscd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END ),2) as twoUncompletedArea-->
+<!-- FROM-->
+<!-- glass_info gi-->
+<!-- left join big_storage_cage_details bscd ON gi.glass_id = bscd.glass_id-->
+<!-- left join engineering e on gi.engineer_id=e.engineer_id-->
+<!-- WHERE-->
+<!-- date(e.create_time) = date(now())-->
+<!-- </select>-->
</mapper>
--
Gitblit v1.8.0