Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-05 31dd633b16c89af8eef7c4dfbc99819db4e7fc3f

 north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml

@@ -15,6 +15,7 @@
            <result column="project" property="order.project"/>
            <result column="area" property="order.area"/>
            <result column="creator" property="order.creator"/>
        <result column="customer_name" property="order.customerName"/>
<!--        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">-->
<!--            <result column="product_id" property="productId"/>-->
<!--            <result column="product_name" property="productName"/>-->
@@ -37,7 +38,8 @@
        o.order_type,
        o.area as gross_area,
        o.quantity as quantity,
        o.creator
        o.creator,
        o.customer_name
        from sd.order_detail  as od
        left join `order` as o
        on o.order_id=od.order_id
@@ -55,6 +57,9 @@
        </if>
        <if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
            and o.order_type regexp #{orderGlassDetail.order.orderType}
        </if>
        <if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
            and o.customer_name regexp #{orderGlassDetail.order.customerName}
        </if>

        <if test="orderGlassDetail.createTime != ''">
@@ -79,7 +84,8 @@
        (od.gross_area) as gross_area,
        (od.quantity) as quantity,
        o.creator,
        od.id
        od.id,
        o.customer_name
        from sd.order_glass_detail  as ogd
        left join  order_detail as od
        on od.order_id=ogd.order_id
@@ -102,6 +108,9 @@
        </if>
        <if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
            and o.order_type regexp #{orderGlassDetail.order.orderType}
        </if>
        <if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
            and o.customer_name regexp #{orderGlassDetail.order.customerName}
        </if>

        <if test="orderGlassDetail.createTime != ''">
@@ -182,4 +191,7 @@
        set o.production_order=#{state}
        where o.order_id = #{orderId}
    </update>
    <select id="selectProcessCard">
        select processing_card from sd.`order` where order_id = #{orderId}
    </select>
</mapper>