From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮：清除笼内状态为0的玻璃数据，并将格子尺寸恢复到初始状态。 2、历史任务按钮：按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时，仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱，当数量小于总层数时，增加是否同一对玻璃的判断，避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index 56269da..e84942f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -39,31 +39,42 @@
AND T1.SLOT IS NULL
</select>
- <select id="listBySlotState" resultMap="RawGlassStorageDetailsDTO">
+ <select id="patternUsage" resultMap="RawGlassStorageDetailsDTO">
select rgsd.pattern_width,
- rgsd.pattern_height,
- rgsd.pattern_thickness,
- rgsd.films_id,
- rgsd.count + sum(lgdth.finish_count) + sum(damage_count),
- rgsd.count,
- sum(lgdth.finish_count) as finishCount,
- sum(damage_count) as damageCount
+ rgsd.pattern_height,
+ rgsd.pattern_thickness,
+ rgsd.films_id,
+ ifnull(rgsd.count,0) + ifnull(sum(lgdth.finish_count),0) + ifnull(sum(damage_count),0) as totalCount,
+ ifnull(rgsd.count,0) as count,
+ ifnull(sum(lgdth.finish_count),0) as finishCount,
+ ifnull(sum(damage_count),0) as damageCount
from (select pattern_width,
- pattern_height,
- pattern_thickness,
- films_id,
- sum(case when state = 100 then remain_quantity else 0 end) as count
- from raw_glass_storage_details
- group by pattern_width, pattern_height, pattern_thickness, films_id) as rgsd
- left JOIN load_glass_device_task_history as lgdth
- on rgsd.pattern_width = lgdth.raw_glass_width
- and rgsd.pattern_height = lgdth.raw_glass_height
- and rgsd.pattern_thickness = lgdth.raw_glass_thickness
- and rgsd.films_id = lgdth.raw_glass_films_id
- where rgsd.pattern_width like "%#{processId}%"
- and rgsd.pattern_height like "%#{pattern_height}%"
- and rgsd.pattern_thickness like "%#{pattern_thickness}%"
- and rgsd.films_id like "%#{films_id}%"
+ pattern_height,
+ pattern_thickness,
+ films_id,
+ sum(case when state = 100 then remain_quantity else 0 end) as count
+ from raw_glass_storage_details
+ group by pattern_width, pattern_height, pattern_thickness, films_id) as rgsd
+ left JOIN load_glass_device_task_history as lgdth
+ on rgsd.pattern_width = lgdth.raw_glass_width
+ and rgsd.pattern_height = lgdth.raw_glass_height
+ and rgsd.pattern_thickness = lgdth.raw_glass_thickness
+ and rgsd.films_id = lgdth.raw_glass_films_id
+ <where>
+ 1=1
+ <if test="width != null and width != ''">
+ and rgsd.pattern_width like concat('%', #{width}, '%')
+ </if>
+ <if test="height != null and height != ''">
+ and rgsd.pattern_height like concat('%', #{height}, '%')
+ </if>
+ <if test="thickness != null and thickness != ''">
+ and rgsd.pattern_thickness like concat('%', #{thickness}, '%')
+ </if>
+ <if test="films != null and films != ''">
+ and rgsd.films_id like concat('%', #{films}, '%')
+ </if>
+ </where>
group by rgsd.pattern_width, rgsd.pattern_height, rgsd.pattern_thickness, rgsd.films_id
</select>
</mapper>
--
Gitblit v1.8.0