blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161 
 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,10 +801,11 @@


                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


        group by fol.remarks,od.order_id


        -- ,fol.process_id


        order by fol.operate_time desc


        limit #{offset},#{pageSize};


    </select>


@@ -817,6 +818,7 @@


        from (select *


        from mm.finished_operate_log aa where aa.operate_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


        left join sd.`order` o on o.order_id=fol.order_id


        <where>


            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}


            and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)


@@ -848,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


@@ -881,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,