From 6d5ee2bbf65a6b7bb12a9d84b3aa98c6505d4998 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 八月 2024 14:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
index d9b1ce4..11899a5 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
@@ -6,24 +6,25 @@
<select id="queryFreeDeviceByUsed" resultType="java.lang.Integer">
SELECT T.DEVICE_ID
FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
+ 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.ENABLE_STATE = 1
GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
+ ORDER BY COUNT(DISTINCT T1.ENGINEER_ID) COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
COUNT(DISTINCT T1.SLOT)
</select>
- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">
- SELECT T.DEVICE_ID
- FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
- ON T.SLOT = T1.SLOT
- WHERE T.MAX_THICKNESS >= #{thickness}
- AND T.ENABLE_STATE = 1
- GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC
- </select>
+ <!-- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">-->
+ <!-- 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.ENABLE_STATE = 1-->
+ <!-- GROUP BY T.DEVICE_ID-->
+ <!-- ORDER BY COUNT(DISTINCT T1.ENGINEER_ID)-->
+ <!-- COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),-->
+ <!-- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC-->
+ <!-- </select>-->
</mapper>
--
Gitblit v1.8.0