From 5ad6234b30f68ae65d6ffc345e874af09c56f4e3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 21 二月 2025 15:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index e9fc32e..56269da 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -2,9 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper">
- <select id="listBySlotState" resultType="java.lang.Integer">
+ <resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
+ <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
- T.SLOT
+ T.SLOT,
+ T.DEVICE_ID
FROM
RAW_GLASS_STORAGE_STATION T
LEFT JOIN RAW_GLASS_STORAGE_DETAILS AS T1 ON T.DEVICE_ID = T1.DEVICE_ID
@@ -21,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