From f8ae5a8b4ac2611c1c53857f961cf06253e38128 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 05 八月 2024 16:55:23 +0800
Subject: [PATCH] 更改接口命名

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
index c506462..ee9090e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
@@ -25,16 +25,23 @@
         SELECT *
         FROM DOWN_STORAGE_CAGE_DETAILS
         WHERE (FLOW_CARD_ID, LAYER) = (SELECT FLOW_CARD_ID, LAYER
-                                       FROM DOWN_STORAGE_CAGE_DETAILS
-                                       WHERE STATE = 100
-                                       GROUP BY FLOW_CARD_ID, LAYER
-                                       ORDER BY COUNT(FLOW_CARD_ID) DESC
-            LIMIT 1 )
-          AND STATE = 100
+        FROM DOWN_STORAGE_CAGE_DETAILS
+        WHERE STATE = 100
+        and (FLOW_CARD_ID, LAYER) not in (
+        select FLOW_CARD_ID, LAYER from down_workstation where flow_card_id is not null and workstation_id not in
+        <foreach collection="workList" item="item" open='(' close=')' separator=','>
+            #{item}
+        </foreach>
+        )
+
+        GROUP BY FLOW_CARD_ID, LAYER
+        ORDER BY COUNT(FLOW_CARD_ID) DESC
+        LIMIT 1 )
+        AND STATE = 100
         ORDER BY
-            WIDTH DESC,
-            HEIGHT DESC
-            LIMIT 1
+        WIDTH DESC,
+        HEIGHT DESC
+        LIMIT 1
     </select>
 
 

--
Gitblit v1.8.0