From 8caf5f04be94d8f52fb291dd045663079d681c19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java b/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java
index d3289f2..ab49739 100644
--- a/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java
+++ b/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java
@@ -1,12 +1,14 @@
package org.jeecg.modules.lsw.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterial;
-import org.jeecg.modules.lsw.entity.LswMaterialInventory;
+import org.jeecg.modules.mes.entity.MesProductionOrder;
+import org.jeecg.modules.sap.dto.OrderBomDTO;
-import java.io.Serializable;
-import java.util.Collection;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
/**
* @Description: 绾胯竟搴撶墿鏂欎俊鎭�
@@ -16,34 +18,28 @@
*/
public interface ILswMaterialService extends IService<LswMaterial> {
+
+ IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
+
/**
- * 娣诲姞涓�瀵瑰
- *
+ * 缂栬緫鐗╂枡淇℃伅
* @param lswMaterial
- * @param lswMaterialInventoryList
+ * @return
*/
- public void saveMain(LswMaterial lswMaterial,List<LswMaterialInventory> lswMaterialInventoryList) ;
-
+ boolean editMaterial(LswMaterial lswMaterial);
+
/**
- * 淇敼涓�瀵瑰
- *
- * @param lswMaterial
- * @param lswMaterialInventoryList
+ * 鏍规嵁鐗╂枡缂栧彿鏌ヨ
+ * @param materialNumber
+ * @return
*/
- public void updateMain(LswMaterial lswMaterial,List<LswMaterialInventory> lswMaterialInventoryList);
-
+ LswMaterial queryByMaterialNumber(String materialNumber);
+
/**
- * 鍒犻櫎涓�瀵瑰
- *
- * @param id
+ * 鎵归噺淇濆瓨鐗╂枡鍩烘湰淇℃伅
+ * @param orderMap
+ * @param orderBomDTOList
+ * @return
*/
- public void delMain (String id);
-
- /**
- * 鎵归噺鍒犻櫎涓�瀵瑰
- *
- * @param idList
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
-
+ boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList);
}
--
Gitblit v1.9.3