From 9b3f76e38ea10241625cee9ea6e9fa69e792d38b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 15:46:18 +0800
Subject: [PATCH] 下片任务：fixbug 解决被禁用情况下仍有玻璃走禁用的线路
---
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..10024bb 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 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