From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
index 4268c33..1951cea 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
@@ -2,7 +2,7 @@
import com.yuanchu.mom.pojo.Material;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.dto.MaterialTreeDto;
+import com.yuanchu.mom.pojo.dto.MaterialDto;
import java.util.List;
import java.util.Map;
@@ -14,7 +14,19 @@
*/
public interface MaterialService extends IService<Material> {
- List<MaterialTreeDto> selectTreeByMaterial();
+
+ /**
+ * 鏍囧噯MOM-->宸︿晶浜旂骇鏍戝睍绀�
+ * @return
+ */
+ List<Map<String,Object>> selectTreeByMaterial();
+
+ /**
+ * (1,2绾�)鏂板-->鐗╂枡,鏍囧噯,鍨嬪彿
+ * @param materialDto
+ * @return
+ */
+ void addMaterial(MaterialDto materialDto);
/**
* 鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
@@ -30,8 +42,9 @@
* @return
*/
List<Map> selectIdByCoNa(String name, String code);
+
/**
- * 妫�楠屾ā鍧�-->OMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(椤圭洰鍚嶇О涓嬫媺妗嗭細Id涓庡悕绉帮紝缂栫爜)
+ * 妫�楠屾ā鍧�-->QMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(椤圭洰鍚嶇О涓嬫媺妗嗭細Id涓庡悕绉帮紝缂栫爜)
*/
List<Map<String, Object>> selectMaterialIdAndNameAndCode();
@@ -40,4 +53,5 @@
* @return
*/
List<Material> selectMaterial();
+
}
--
Gitblit v1.9.3