From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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..b5fa40e 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,30 +14,19 @@
*/
public interface MaterialService extends IService<Material> {
- List<MaterialTreeDto> selectTreeByMaterial();
/**
- * 鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
- * @param name
+ * 鏍囧噯MOM-->宸︿晶浜旂骇鏍戝睍绀�
* @return
*/
- List<Material> selectMcodeId(String name);
+ List<Map<String,Object>> selectTreeByMaterial();
/**
- * 鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d
- * @param name
- * @param code
+ * (1,2绾�)鏂板-->鐗╂枡,鏍囧噯,鍨嬪彿
+ * @param materialDto
* @return
*/
- List<Map> selectIdByCoNa(String name, String code);
- /**
- * 妫�楠屾ā鍧�-->OMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(椤圭洰鍚嶇О涓嬫媺妗嗭細Id涓庡悕绉帮紝缂栫爜)
- */
- List<Map<String, Object>> selectMaterialIdAndNameAndCode();
+ String addMaterial(MaterialDto materialDto);
- /**
- * 鏌ヨ鎵�鏈夌墿鏂欎俊鎭�
- * @return
- */
- List<Material> selectMaterial();
+
}
--
Gitblit v1.9.3