Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-18 4dcb5e299757924aef0edc4d608d2305dbedc780

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

@@ -74,6 +74,10 @@

    List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode,String producer);

    List<MaterialInventory> getMaterialInventoryCount1(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer,Long id);

    List<MaterialInventory> getMaterialInventoryCountNull1(@Param("materialCode") Long materialCode,String producer,Long id);


    List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);