From cf33278c73767f72e35a4898c23765f52a3bfd1d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 09:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywMes'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 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..3c508d8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper">
- <resultMap id="bigStorageDTO" type="com.mes.bigstorage.entity.BigStorageDTO">
+ <resultMap id="bigStorageDTO" type="com.mes.bigstorage.entity.dto.BigStorageDTO">
<result column="REMAIN_WIDTH" property="width"/>
<result column="GLASS_COUNT" property="glassCount"/>
</resultMap>
@@ -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