From fb475fba72f99e9df89ddbd739664909a1cc91ba Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 17:13:59 +0800
Subject: [PATCH] 修改上片历史任务接口条件

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml |   24 +++++++++++++++---------
 1 files changed, 15 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..5d6f3ef 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
@@ -25,16 +25,22 @@
         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 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