blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-07-10 e490a85c14e9147f424b5c971b1d0d04928eb613 
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml


@@ -28,6 +28,7 @@


        <result column="height" property="orderDetail.height"/>


        <result column="product_id" property="orderDetail.productId"/>


        <result column="product_name" property="orderDetail.productName"/>


        <result column="price" property="orderDetail.price"/>




        <result column="project" property="order.project"/>


        <result column="customer_name" property="order.customerName"/>


@@ -60,7 +61,8 @@


        fol.area,


        fol.money,


        o.customer_name,


        o.project


        o.project,


        od.price


        from (select *


        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol


        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number


@@ -90,6 +92,9 @@


            </if>


            <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


            <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">


                and  od.price regexp #{finishedOperateLog.orderDetail.price}


            </if>


            <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">


                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


@@ -161,6 +166,9 @@


            <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


            <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">


                and  od.price regexp #{finishedOperateLog.orderDetail.price}


            </if>


            <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">


                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


            </if>