From 8738b8e0f7cfa65732bfc0e40fa80e1ca3c7e27e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 19 十月 2024 08:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
index 2776022..954de19 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -15,6 +15,7 @@
SUM(case task_state when 2 then 1 else 0 end) as real_count
from big_storage_cage_feed_task
where task_state in (1, 2)
+ and deleted = 0
and (target_slot = 0 or target_slot is null)
group by line
) t
@@ -33,8 +34,10 @@
ELSE HEIGHT
END MAX_LENGTH
FROM BIG_STORAGE_CAGE_FEED_TASK
- WHERE LINE = 2002
+ WHERE LINE = #{line}
+ AND (target_slot = 0 or target_slot is null)
AND TASK_STATE IN (1, 2)
+ and deleted = 0
) T
</select>
--
Gitblit v1.8.0