From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
index 3ef3805..3340925 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
@@ -29,6 +29,7 @@
select slot, min(id) as id, count(*) as glass_count
from edg_storage_cage_details
where state = 100
+ and device_id = #{deviceId}
group by slot
),
size_max_temp as (
@@ -50,9 +51,31 @@
and t.height = #{height}
</if>
</where>
- order by total_count desc, glass_count, abs(t.slot - 10)
+ order by total_count desc, glass_count, abs(t.slot - #{currentSlot})
)
select *
from slot_temp limit 1
</select>
+ <select id="queryCutDrawingByEngineerId" resultType="com.mes.edgstoragecage.entity.vo.CutDrawingVO">
+ with glass_temp as (
+ select * from glass_info where engineer_id = #{engineerId} and pattern_sequence = #{patternSequence}
+ ), cut_drawing_temp as (
+ select t.*,
+ case when t2.glass_id is not null then t2.type
+ when t1.glass_id is not null then t1.state
+ else 0 end as state
+ from glass_temp t
+ left join edg_storage_cage_details t1 on t.glass_id = t1.glass_id
+ left join damage t2 on t.glass_id = t2.glass_id and t2.type in (8,9)
+ )select * from cut_drawing_temp where 1=1
+ <if test="isAll == 1">
+ and state = 0
+ </if>
+
+ </select>
+ <select id="querySlotRemainWidth" resultType="com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO">
+ select device_id,slot, if(#{cellLength} - sum(GREATEST(width,height)+#{glassGap}) < 0 ,0,#{cellLength} -
+ sum(GREATEST(width,height)+#{glassGap}) )as
+ remain_width from edg_storage_cage_details where state = 100 group by device_id,slot
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0