From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
index f2cbc0a..cd4c157 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
@@ -10,13 +10,20 @@
<result column="remain_width" property="remainWidth" jdbcType="INTEGER"/>
</resultMap>
+ <update id="resetSlotRemainWidth">
+ <foreach collection="list" item="item" separator=";" open="begin" close=";end;">
+ update edg_storage_cage set remain_width = #{item.remainWidth} where
+ device_id = #{item.deviceId} and slot = #{item.slot}
+ </foreach>
+ </update>
+
<select id="getEdgStorageCageBySize" resultMap="baseMap">
select t.*
from edg_storage_cage t
left join edg_storage_cage_details t1 on t.slot = t1.slot
where t.device_id = #{deviceId}
and t1.state = 100
- and t.remain_width >= #{width}
+ and t.remain_width >= GREATEST(#{width}, #{height})
and t1.width = #{width}
and t1.height = #{height}
and t.enable_state = 1
--
Gitblit v1.8.0