From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index e8b6dc5..034b5e3 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -15,6 +15,7 @@
  * @since 2023-07-17
  */
 public interface MaterialService extends IService<Material> {
+    List<Material> selectMaterialLimit(int pageSize,int countSize);
 
     Integer addMaterialInformation(Material material);
 
@@ -30,7 +31,7 @@
      * @param materialId
      * @return
      */
-    Integer deleteMaterialInformation(Integer materialId);
+    Integer deleteMaterialInformation(String materialId);
 
     /**
      * 鏇存柊Material鐨勬暟鎹�
@@ -40,9 +41,11 @@
     Integer updateMaterialInformation(Material material);
 
     /**
-     * 鍒犻櫎绛変簬SpecificationId鐨勬暟鎹�
-     * @param specificationsId
+     * 鍒犻櫎绛変簬SpecificationsId鐨勭墿鏂欐暟鎹�
+     * @param deleteSpecificationsId
      * @return
      */
-    List<String> deleteMaterialEqSpecification(String specificationsId);
+    List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId);
+
+    Map selectMaterialById(String materialId);
 }

--
Gitblit v1.9.3