From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 15 ++++++++++++++-
1 files changed, 14 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 1ef2f3f..072185f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -2,7 +2,12 @@
<!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">
- <select id="querySitToUpGlass" resultType="java.lang.String">
+ <resultMap id="bigStorageDTO" type="com.mes.bigstorage.entity.BigStorageDTO">
+ <result column="REMAIN_WIDTH" property="width"/>
+ <result column="GLASS_COUNT" property="glassCount"/>
+ </resultMap>
+
+ <select id="querySitToUpGlass" resultType="java.lang.Integer">
select t.line
from (
select line,
@@ -10,9 +15,17 @@
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 target_slot is null
group by line
) t
where t.total_count = t.real_count
</select>
+ <select id="querySitToUpRemainWidth" resultMap="bigStorageDTO">
+ SELECT cast(5000 - sum(width + 20) as INT) as REMAIN_WIDTH,
+ count(glass_id) as GLASS_COUNT
+ FROM big_storage_cage_feed_task
+ WHERE line = #{line}
+ AND task_state in (1, 2)
+ </select>
</mapper>
--
Gitblit v1.8.0