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


@@ -118,7 +118,7 @@


                and fol.type regexp #{finishedOperateLog.type}


            </if>


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


                and fol.remarks regexp #{finishedOperateLog.remarksr}


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


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


                and fol.area regexp #{finishedOperateLog.area}


@@ -192,7 +192,7 @@


                and fol.type regexp #{finishedOperateLog.type}


            </if>


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


                and fol.remarks regexp #{finishedOperateLog.remarksr}


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


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


                and fol.area regexp #{finishedOperateLog.area}


@@ -801,7 +801,7 @@


                and  o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}


            </if>


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


                and fol.remarks regexp #{finishedOperateLog.remarksr}


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


        </where>


        group by fol.remarks,od.order_id


@@ -850,7 +850,7 @@


                and  o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}


            </if>


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


                and fol.remarks regexp #{finishedOperateLog.remarksr}


                and fol.remarks regexp #{finishedOperateLog.remarks}


            </if>


        </where>


        group by fol.remarks,od.order_id,fol.process_id) as zu


@@ -883,6 +883,7 @@


        select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select  o.order_id,


                                                                             o.customer_name,


                                                                             o.project,


                                                                             o.batch,


                                                                             fol.remarks,


                                                                             SUM(fol.quantity) as quantity,


                                                                             ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,