From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 09 七月 2024 08:34:31 +0800
Subject: [PATCH] 1、任务新增计时功能，日志打印每次任务执行的周期 2、卧式理片笼更新出片规则：都为禁用（2），笼子不出玻璃；存在一个禁用，07片台可以存玻璃；都非禁用：两片台有玻璃笼子不出片
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
index df344d2..76a9216 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
@@ -46,7 +46,7 @@
<select id="queryWorkStationIsIn" resultMap="downGlassInfo">
SELECT T.*
- <if test="isDownload == null and isDownload == true ">
+ <if test="!isDownload">
,T1.*
</if>
FROM (
@@ -54,22 +54,19 @@
T.LAYER,
COUNT(T.LAYER) AS COUNT
FROM
- DOWN_GLASS_INFO T
- INNER JOIN DOWN_WORKSTATION T1
- ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
- AND T.LAYER = T1.LAYER
- GROUP BY
- T.FLOW_CARD_ID,
- T.LAYER
+ DOWN_WORKSTATION T
+ LEFT JOIN DOWN_GLASS_INFO T1 ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
+ GROUP BY T.FLOW_CARD_ID,LAYER
+ HAVING T.FLOW_CARD_ID IS NOT NULL
) T
INNER JOIN GLASS_INFO T1 ON T.FLOW_CARD_ID = T1.FLOW_CARD_ID
AND T.LAYER = T1.LAYER
LEFT JOIN DOWN_GLASS_INFO T2 ON T1.GLASS_ID = T2.GLASS_ID
<where>
- <if test="isDownload == null or isDownload == false">
+ <if test="isDownload">
AND T2.GLASS_ID IS NULL
</if>
- <if test="isDownload == true">
+ <if test="!isDownload">
AND T2.GLASS_ID IS not NULL
</if>
</where>
--
Gitblit v1.8.0