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

guoyujie

2025-07-14 16bbf8260110e2790f304e8421cf7591837ca302

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

@@ -266,4 +266,9 @@

    String selectProjectNo(@Param("useId") Integer useId);

    List<MaterialLog> getOptimizeOutboundReport(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    Map<String,Integer> getOptimizeOutboundReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    List<Map<String,Object>> getSelectMaterialInventoryMes();
}