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

chenlu

2024-08-06 d20289401001352bb20ca0bd614f4ef3e2c749d0

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

@@ -35,17 +35,17 @@

    List<Map<String,Object>> getSelectMaterialInventory(@Param("offset") Integer offset,
                                                       @Param("pageSize") Integer pageSize,
                                                       @Param("materialInventory") MaterialInventory materialInventory);
                                                       @Param("materialInventory") MaterialInventory materialInventory, @Param("ids") List<Long> ids);


    Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory);
    Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory, @Param("ids") List<Long> ids);

    List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset,
                                                        @Param("pageSize") Integer pageSize,
                                                        @Param("optimizeUse") OptimizeUse optimizeUse);
                                                        @Param("optimizeUse") OptimizeUse optimizeUse, @Param("ids") List<Long> ids);


    Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse);
    Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse, @Param("ids") List<Long> ids);

    Boolean insertMaterialStore(@Param("type") String type,
                                         @Param("json") String json);
@@ -185,4 +185,21 @@
                                    @Param("totalArea") Double totalArea,
                                    @Param("returningWarehouseDetail") ReturningWarehouseDetail returningWarehouseDetail);

    Boolean updateMaterialInventoryArea(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea);

    List<SurplusMaterials> getSelectSurplusMaterialsDate(@Param("offset") Integer offset,
                                                             @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                             @Param("surplusMaterials") SurplusMaterials surplusMaterials);

    Map<String,Integer> getSelectSurplusMaterialsDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate,SurplusMaterials surplusMaterials);

    SurplusMaterials selectSurplusMaterialsCount( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
    Boolean insertSurplusMaterials( @Param("surplusMaterials") SurplusMaterials surplusMaterials);

    Boolean insertSurplusMaterialsLog(@Param("surplusMaterials") SurplusMaterials surplusMaterials,String creator, String type);

    Boolean updateSurplusMaterialsOutQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);

    Boolean updateSurplusMaterialsIntQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);

}