From ae504e646e4775837eba99aa2efb30e6c3c818d4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index b25a4f4..40ca6d8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -132,13 +132,12 @@
</where>
</update>
<update id="updateDeviceIdBySlot">
- update big_storage_cage_details t innser join big_storage_cage t1 on t.slot = t1.slot
+ update big_storage_cage_details t inner join big_storage_cage t1 on t.slot = t1.slot
set t.device_id = t1.device_id
where t.slot in (
<foreach collection="list" item="item" separator=",">
- (#{item}
+ #{item}
</foreach>
- )
)
</update>
@@ -175,8 +174,8 @@
total_count,
real_count,
ifnull(damage_count, 0) as damage_count,
- total_count - real_count - ifnull(damage_count, 0) as lack_count
-
+ case when total_count - real_count - ifnull(damage_count, 0) < 0 then 0 else
+ total_count - real_count - ifnull(damage_count, 0) end as lack_count
from big_details_temp t
inner join glass_info_temp t1 on t.engineer_id = t1.engineer_id and
t.tempering_layout_id = t1.tempering_layout_id
@@ -185,7 +184,7 @@
)
select *
from result
- order by engineer_id
+ order by engineer_id,tempering_layout_id
</select>
<select id="queryIsAllNeedDispatchVirtualSlot" resultMap="virtualSlotSequenceDTO">
@@ -267,4 +266,12 @@
SELECT *
FROM result
</select>
+ <select id="querybigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
+ select bsc.device_id, bsc.slot, count(bscd.glass_id) as count
+ from big_storage_cage bsc
+ left join big_storage_cage_details bscd
+ on bsc.slot = bscd.slot and bscd.state in (100, 102, 103, 104)
+ group by bsc.device_id, bsc.slot
+ order by bsc.device_id, bsc.slot
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0