From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
index 4ddfc1f..6c63fa7 100644
--- a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
+++ b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
@@ -1,12 +1,13 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
+import org.jeecg.modules.pms.vo.ProcessBillMaterialsDetailVo;
import org.jeecg.modules.sap.dto.OrderBomDTO;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -17,8 +18,6 @@
* @Version: V1.0
*/
public interface IPmsProcessBillMaterialsService extends IService<PmsProcessBillMaterials> {
- IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
-
/**
* 鎵归噺淇濆瓨鎴栨洿鏂拌鍗旴OM鏁版嵁
* @param orderMap
@@ -33,4 +32,14 @@
* @return
*/
PmsProcessBillMaterials getByOrderId(String orderId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<PmsProcessBillMaterials> queryPageList(Page<PmsProcessBillMaterials> page, PmsProcessBillMaterials query);
+
+ List<ProcessBillMaterialsDetailVo> queryMaterialsDetailByOrderIdAndMaterialNumber(String orderId, String materialNumber);
}
--
Gitblit v1.9.3