1、中空夹胶线出片逻辑优化 2、钢化前卧转新增协议卧转立允许信号

zhoushihao

2025-11-25 b460ec7a380334516ec478544afe42df409f4c54

 hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml

@@ -72,14 +72,16 @@
        p.glass_thickness,
        p.glass_type,
        p.glass_total,
        p.glass_total_area
        p.glass_total_area,
        IFNULL(e.state,0) as state
        from north_glass_mes.engineer_scheduling es
        left join pp.optimize_project p on es.project_no=p.project_no
        left join north_glass_mes.engineering e on es.project_no=e.engineer_id
        where es.state = 100
        <if test="type != null and type != ''">
            and es.type = #{type}
        </if>
        order by es.id
        order by case when IFNULL(e.state, 0) = 1 then 0 else 1 end, es.id
    </select>

    <!-- 根据类型删除engineer_scheduling表中的数据 -->