From 3e1645e47164f26470bbd62522776cc8a996d33f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:03:40 +0800
Subject: [PATCH] 1、优化原片仓储 2、优化中空任务处理逻辑 3、修改中空理片笼向前端推送数据格式
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index 53d09c7..56269da 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -6,6 +6,17 @@
<result column="DEVICE_ID" property="deviceId"/>
<result column="SLOT" property="slot"/>
</resultMap>
+ <resultMap id="RawGlassStorageDetailsDTO" type="com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO">
+ <result property="patternWidth" column="pattern_width"/>
+ <result property="patternHeight" column="pattern_height"/>
+ <result property="patternThickness" column="pattern_thickness"/>
+ <result property="filmsId" column="films_id"/>
+ <result property="count" column="count"/>
+ <result property="finishCount" column="finishCount"/>
+ <result property="damageCount" column="damageCount"/>
+ <!-- 濡傛灉鏈夊叾浠栧瓧娈碉紝璇风户缁坊鍔� -->
+ </resultMap>
+
<select id="listBySlotState" resultMap="baseMap">
SELECT
@@ -27,4 +38,32 @@
</foreach>
AND T1.SLOT IS NULL
</select>
+
+ <select id="listBySlotState" 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
+ 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}%"
+ group by rgsd.pattern_width, rgsd.pattern_height, rgsd.pattern_thickness, rgsd.films_id
+ </select>
</mapper>
--
Gitblit v1.8.0