blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-09-28 939ccc9c254870ed15cdd485b9d303bbb00a23f2 
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml


@@ -95,7 +95,7 @@


                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}


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


            </if>


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


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


@@ -122,10 +122,10 @@


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


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


                and fol.area regexp #{finishedOperateLog.area}


                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')


            </if>


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


                and fol.money regexp #{finishedOperateLog.money}


                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')


            </if>


            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">


                and o.customer_name regexp #{finishedOperateLog.order.customerName}


@@ -159,6 +159,9 @@


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


                and fol.quantity regexp #{finishedOperateLog.quantity}


            </if>


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


                and fol.process_id regexp #{finishedOperateLog.processId}


            </if>


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


                and fol.operator regexp #{finishedOperateLog.operator}


            </if>


@@ -169,7 +172,7 @@


                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}


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


            </if>


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


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


@@ -196,10 +199,10 @@


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


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


                and fol.area regexp #{finishedOperateLog.area}


                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')


            </if>


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


                and fol.money regexp #{finishedOperateLog.money}


                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')


            </if>


            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">


                and o.customer_name regexp #{finishedOperateLog.order.customerName}


@@ -680,11 +683,12 @@


                                            quantity,


                                            operate_time,


                                            status,


                                            remarks


                                            remarks,


                                            area


        )


        values (


                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}


                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo}


                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo},#{orderDetail.deliveryDetail.area}


               )


    </insert>