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/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index 02a1e8a..83fde30 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -296,11 +296,11 @@
         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
+        select bsc.device_id, bsc.slot,bscd.glass_id,if(bscd.width>bscd.height,bscd.width,bscd.height) as length
         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
+                 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,bscd.glass_id
         order by bsc.device_id, bsc.slot
     </select>
     <select id="queryNeedDispatch" resultType="com.mes.bigstorage.entity.BigStorageCageDetails">

--
Gitblit v1.8.0