Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-18 6661232f32135d943c76197afba2baac81e171f4

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -24,6 +24,9 @@

    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);

    FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
                                        @Param("order_number") Integer order_number,
                                        @Param("process_id") String process_id);
    List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
                                       @Param("pageSize") Integer pageSize,
                                       @Param("flowCard") FlowCard flowCard);