From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错
---
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