From 536bc2a23e909d89eece37a0c3278c85012ec8ce Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 九月 2024 14:42:56 +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