From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java b/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
index a3d097b..df9d5b7 100644
--- a/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
+++ b/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
@@ -1,6 +1,7 @@
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.PmsMaterialProcess;
@@ -17,8 +18,6 @@
* @Version: V1.0
*/
public interface IPmsMaterialProcessService extends IService<PmsMaterialProcess> {
- IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
-
/**
*
* @param orderMap
@@ -31,4 +30,12 @@
* @param orderId
*/
void removeByOrderId(String orderId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<PmsMaterialProcess> queryPageList(Page<PmsMaterialProcess> page, PmsMaterialProcess query);
}
--
Gitblit v1.9.3