Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-17 b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6

 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,43 @@
        </foreach>
        AND T1.SLOT IS NULL
    </select>

    <select id="patternUsage" resultMap="RawGlassStorageDetailsDTO">
        select rgsd.pattern_width,
        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>
            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>