Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -893,15 +893,18 @@
        </where>
        order by fgi.update_time desc

        limit #{offset},#{pageSize};
        <!-- limit #{offset},#{pageSize}-->
        ;
    </select>


    <select id="getPageTotal">
        select
        CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
        1  as 'pageTotal',
        <!-- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal', -->

        count(fgi.id) as 'total'
        from finished_goods_inventory fgi
        from mm.finished_goods_inventory fgi
        left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
        left join sd.`order` o on fgi.order_id = o.order_id
        <where>
@@ -987,7 +990,7 @@
        </where>

        order by fgi.update_time desc
        limit #{offset},#{pageSize}
        <!-- limit #{offset},#{pageSize} as 'pageTotal', -->
        ;
    </select>

@@ -1071,11 +1074,11 @@
    <select id="getPrintTitleByBox">
        select kkk.*,
               rw.teams_groups_name as teams_groups_name2
        from(select  o.order_id,
        from(select #{orderId} as order_id,
                 o.customer_name,
                 o.customer_id,
                 o.project,
                 o.batch,
                 (select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,
                 fol.box_no as 'remarks',
                 SUM(fol.quantity_available) as quantity,
                 ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,