1、 切割/钢化版图展示，仅将破损未报工的小片显示为破损

zhoushihao

2025-10-19 f9978d9309b3a75f078b32746bcb96d4afd55bcc

1、 切割/钢化版图展示，仅将破损未报工的小片显示为破损

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -191,8 +191,8 @@
        List<LoadGlassInfo> glassInfos = null;
        glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
                .select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
                .leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" +
                        "ON t.glass_id = b.glass_id")
                .leftJoin("(SELECT glass_id, type as state FROM damage where type in (8, 9) and status = 1) b\n" +
                        "ON t.glass_id = b.glass_id ")
                .eq("engineer_id", glassInfo.getEngineerId())
                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
        return glassInfos;

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml

@@ -69,7 +69,7 @@
        else 0 end as state
        from glass_temp t
        left join edg_storage_cage_details t1 on t.glass_id = t1.glass_id
        left join damage t2 on t.glass_id = t2.glass_id and t2.type in (8,9)
        left join damage t2 on t.glass_id = t2.glass_id and t2.type in (8,9) AND t2.STATUS = 1
        )select * from cut_drawing_temp where 1=1
        <if test="isAll == 1">
            and state = 0
@@ -78,10 +78,10 @@
    </select>
    <select id="querySlotRemainWidth" resultType="com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO">
        select device_id,
               slot,
               if(#{cellLength} - sum(GREATEST(width, height) + #{glassGap}) &lt; 0, 0, #{cellLength} -
                                                                                        sum(GREATEST(width, height) + #{glassGap})) as
                   remain_width
        slot,
        if(#{cellLength} - sum(GREATEST(width, height) + #{glassGap}) &lt; 0, 0, #{cellLength} -
        sum(GREATEST(width, height) + #{glassGap})) as
        remain_width
        from edg_storage_cage_details
        where state = 100
        group by device_id, slot
@@ -115,26 +115,27 @@
        limit 1
    </select>
    <select id="queryPieChart" resultType="com.mes.largenscreen.entity.PieChartVO">
        SELECT round(sum(CASE WHEN e.station_cell = 5 THEN 1 ELSE 0 END), 2)                                                   as oneCompletedQuantity,
               round(sum(CASE WHEN e.station_cell = 5 THEN escd.width * escd.height / 1000000 ELSE 0 END),
                     2)                                                                                                        as oneCompletedArea,
               round(sum(CASE WHEN e.station_cell = 6 THEN 1 ELSE 0 END), 2)                                                   as twoCompletedQuantity,
               round(sum(CASE WHEN e.station_cell = 6 THEN escd.width * escd.height / 1000000 ELSE 0 END),
                     2)                                                                                                        as twoCompletedArea,
               round(sum(CASE WHEN e.station_cell = 5 and escd.device_id is null THEN 1 ELSE 0 END),
                     2)                                                                                                        as oneUncompletedQuantity,
               round(sum(CASE
                             WHEN e.station_cell = 5 and escd.device_id is null THEN gi.width * gi.height / 1000000
                             ELSE 0 END),
                     2)                                                                                                        as oneUncompletedArea,
               round(sum(CASE WHEN e.station_cell = 6 and escd.device_id is null THEN 1 ELSE 0 END),
                     2)                                                                                                        as twoUncompletedQuantity,
            round(sum( CASE WHEN e.station_cell = 6 and escd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END ),2) as twoUncompletedArea
        SELECT round(sum(CASE WHEN e.station_cell = 5 THEN 1 ELSE 0 END), 2) as oneCompletedQuantity,
        round(sum(CASE WHEN e.station_cell = 5 THEN escd.width * escd.height / 1000000 ELSE 0 END),
        2) as oneCompletedArea,
        round(sum(CASE WHEN e.station_cell = 6 THEN 1 ELSE 0 END), 2) as twoCompletedQuantity,
        round(sum(CASE WHEN e.station_cell = 6 THEN escd.width * escd.height / 1000000 ELSE 0 END),
        2) as twoCompletedArea,
        round(sum(CASE WHEN e.station_cell = 5 and escd.device_id is null THEN 1 ELSE 0 END),
        2) as oneUncompletedQuantity,
        round(sum(CASE
        WHEN e.station_cell = 5 and escd.device_id is null THEN gi.width * gi.height / 1000000
        ELSE 0 END),
        2) as oneUncompletedArea,
        round(sum(CASE WHEN e.station_cell = 6 and escd.device_id is null THEN 1 ELSE 0 END),
        2) as twoUncompletedQuantity,
        round(sum( CASE WHEN e.station_cell = 6 and escd.device_id is null THEN gi.width*gi.height/1000000 ELSE 0 END
        ),2) as twoUncompletedArea
        FROM
            glass_info gi
                left join edg_storage_cage_details escd ON gi.glass_id = escd.glass_id
                left join engineering e on gi.engineer_id=e.engineer_id
        glass_info gi
        left join edg_storage_cage_details escd ON gi.glass_id = escd.glass_id
        left join engineering e on gi.engineer_id=e.engineer_id
        WHERE
            date(e.create_time) = date(now())
        date(e.create_time) = date(now())
    </select>
</mapper>