From 07f06034a1eaec80104b04d076306c072a466bd6 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 30 十二月 2024 13:45:04 +0800
Subject: [PATCH] 上片结束工程工程号取值

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml |    6 +++++-
 1 files changed, 5 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..a256384 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -15,10 +15,13 @@
                         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
+                 HAVING  DATEDIFF(SECOND, max(create_time), GETDATE()) + 45 > 40 or SUM(case task_state when 2 then 1 else 0 end)>1
              ) t
         where t.total_count = t.real_count
+        order by real_count desc,line desc
     </select>
     <select id="querySitToUpRemainWidth" resultMap="bigStorageDTO">
         SELECT CAST
@@ -33,8 +36,9 @@
                             ELSE HEIGHT
                             END MAX_LENGTH
                  FROM BIG_STORAGE_CAGE_FEED_TASK
-                 WHERE LINE = 2002
+                 WHERE LINE = #{line}
                    AND TASK_STATE IN (1, 2)
+                   and deleted = 0
              ) T
     </select>
 

--
Gitblit v1.8.0