修改

廖井涛

2024-04-09 57162abde4950b331c49777b3425b60d21de7732

修改

 north-glass-erp/target/classes/mapper/pp/Report.xml

@@ -63,11 +63,7 @@
            e.reportWorkQuantityCount,
            e.broken_num,
            round(ifnull(f.inventory,0)*a.area,2) as  inventoryArea
<<<<<<< HEAD
 
=======

>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
        from
            flow_card as c
        left join
@@ -100,14 +96,8 @@
            ) as e
        on e.process_id = c.process_id
            and e.technology_number = c.technology_number
<<<<<<< HEAD
 
        where a.order_id = #{orderId}
 
=======

        where a.order_id = #{orderId}

>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
    </select>
</mapper>

 north-glass-erp/target/classes/mapper/sd/OrderDetail.xml

@@ -68,11 +68,11 @@

    </update>
    
    <select id="getOrderReport">
        SELECT
            from order_detail as a
            left join sd.`order` o on o.id = a.order_id
<!--    <select id="getOrderReport">-->
<!--        SELECT-->
<!--            from order_detail as a-->
<!--            left join sd.`order` o on o.id = a.order_id-->

    </select>
<!--    </select>-->

</mapper>