From 77f5af7a1cd1a57804a6391f5e2c73e8ae10a531 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 23:32:37 +0800
Subject: [PATCH] 1、优化出片队列,避免930lisec出片玻璃顺序倒叙情况下,出片玻璃尺寸较大一车只能存放小于一对的数量造成玻璃顺序错乱问题

---
 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