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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index b87c897..83fde30 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -32,6 +32,7 @@
<resultMap id="temperingGlassCount" type="com.mes.bigstorage.entity.dto.TemperingGlassCountDTO">
<result column="engineer_id" property="engineerId"/>
+ <result column="engineer_name" property="engineerName"/>
<result column="tempering_layout_id" property="temperingLayoutId"/>
<result column="films_id" property="filmsId"/>
<result column="thickness" property="thickness"/>
@@ -166,9 +167,9 @@
<select id="selectTemperingGlassCount" resultMap="temperingGlassCount">
with glass_info_temp as (
- select engineer_id, tempering_layout_id, count(*) as total_count
- from glass_info
- group by engineer_id, tempering_layout_id
+ select t.engineer_id,t1.engineer_name, t.tempering_layout_id, count(*) as total_count
+ from glass_info t inner join engineering t1 on t.engineer_id=t1.engineer_id
+ group by t.engineer_id, t.tempering_layout_id
),
big_details_temp as (
select engineer_id, tempering_layout_id, count(*) as real_count, films_id, thickness
@@ -191,6 +192,7 @@
),
result as (
select t.engineer_id,
+ t1.engineer_name,
t.tempering_layout_id,
t.films_id,
t.thickness,
@@ -294,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">
@@ -306,7 +308,7 @@
FROM big_storage_cage_details
WHERE STATE = 100
AND SLOT =
- (SELECT SLOT FROM big_storage_cage_details WHERE STATE = 100 AND sequence = 1 order by slot desc LIMIT 1)
+ (SELECT SLOT FROM big_storage_cage_details WHERE STATE = 100 AND sequence = 1 AND device_id = 4 order by slot desc LIMIT 1)
ORDER BY tempering_feed_sequence
</select>
--
Gitblit v1.8.0