From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 b355c3c..b267d29 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
@@ -2,6 +2,8 @@
import com.yuanchu.limslaboratory.pojo.Material;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -15,37 +17,34 @@
* @since 2023-07-17
*/
public interface MaterialService extends IService<Material> {
- List<Material> selectMaterialLimit(int pageSize,int countSize);
- Integer addMaterialInformation(Material material);
+ List<Map> selectMaterialLimit(int pageSize,int countSize, int type);
- /**
- * 渚ц竟鏍忕墿鏂欐暟鎹�
- * @param specificationsId
- * @return
- */
- List<Map<String, Object>> getListMaterialInformation(String specificationsId);
/**
* 鍒犻櫎绛変簬MaterialId鐨勬暟鎹�
* @param materialId
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
Integer deleteMaterialInformation(Integer materialId);
/**
- * 鏇存柊Material鐨勬暟鎹�
- * @param material
- * @return
+ * 涓夌骇娣诲姞鍙傛暟
*/
- Integer updateMaterialInformation(Material material);
+ @Transactional(rollbackFor = Exception.class)
+ Integer addMaterialInformation(AddMaterialDto addMaterialDto);
/**
- * 鍒犻櫎绛変簬SpecificationId鐨勬暟鎹�
- * @param specificationsId
+ * 鍥涚骇鍒嗗眰鏄剧ず
+ */
+ List<Map<String, Object>> getFourLevelInformation();
+
+
+ /**
+ * 娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О
* @return
*/
- List<String> deleteMaterialEqSpecification(String specificationsId);
+ List<String> selectmater();
- Map selectMaterialById(String materialId);
}
--
Gitblit v1.9.3