diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
index dfcaf204..d661ae99 100644
--- a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
@@ -58,7 +58,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
             {
                 SUCCESS(null);
             }
-            var response = materialInputService.Getworkorderlist(query.datetimespan);
+          
+            var response = materialInputService.Getworkorderlist(query);
             return SUCCESS(response);
         }
 
diff --git a/ZR.Model/MES/mm/Dto/WorkorderqueryDto.cs b/ZR.Model/MES/mm/Dto/WorkorderqueryDto.cs
index f486aee9..e90bf0ba 100644
--- a/ZR.Model/MES/mm/Dto/WorkorderqueryDto.cs
+++ b/ZR.Model/MES/mm/Dto/WorkorderqueryDto.cs
@@ -9,5 +9,10 @@ namespace ZR.Model.MES.mm.Dto
     public class WorkorderqueryDto
     {
        public  DateTime datetimespan { set; get; }
+
+        public  int? pageNum { set; get; }
+        public  int? pageSize { set; get; }
+
+
     }
 }
diff --git a/ZR.Service/mes/mm/IService/IMaterialInputService.cs b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
index 046e67e8..e4b6d631 100644
--- a/ZR.Service/mes/mm/IService/IMaterialInputService.cs
+++ b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
@@ -11,13 +11,13 @@ using ZR.Model.MES.pro;
 
 namespace ZR.Service.mes.mm.IService
 {
-     public  interface IMaterialInputService
-     {
+    public interface IMaterialInputService
+    {
         string[] Getstart_AGV_points();
         string[] Getend_AGV_points();
 
-        List<ProWorkorder_v2> Getworkorderlist(DateTime datetimespan);
-        int Generatetask(IngredientTaskDto task,string name);
+        (List<ProWorkorder_v2>, int) Getworkorderlist(WorkorderqueryDto query);
+        int Generatetask(IngredientTaskDto task, string name);
 
 
         List<MmIngredientTask> GetIngredientTask(IngredientTaskQueryDto queryParams);
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index dc6a300a..7a1e2b9c 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -22,6 +22,7 @@ using ZR.Model.MES.wms;
 using System.Text.Json;
 using Infrastructure;
 using ZR.Repository;
+using System.Numerics;
 
 namespace ZR.Service.mes.mm
 {
@@ -76,8 +77,9 @@ namespace ZR.Service.mes.mm
         /// </summary>
         /// <param name="datetimespan"></param>
         /// <returns></returns>
-        public List<ProWorkorder_v2> Getworkorderlist(DateTime datetimespan)
+        public (List<ProWorkorder_v2>,int) Getworkorderlist(WorkorderqueryDto query)
         {
+            DateTime datetimespan = query.datetimespan;
 
             // 获取年份和周数
             Calendar calendar = new GregorianCalendar();
@@ -89,22 +91,24 @@ namespace ZR.Service.mes.mm
             int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字
 
 
-
+            int total = 0;
             List<ProWorkorder_v2> WorkorderList = Context.Queryable<ProWorkorder_v2>()
                  .Where(it => it.Year == year)
                  .Where(it => it.Week == week)
                  .Where(it => it.Date == dayOfWeekNumber)
-                 .Where(it => it.Remark3 == "是"||it.Remark1=="调试")
-                 .ToList();
-          
+                 .Where(it => it.Remark3 == "是" || it.Remark1 == "调试").ToList();
+                // .ToPageList(query.pageNum??1, query.pageSize??10, ref total);
+
             foreach (ProWorkorder_v2 workorder in WorkorderList)
             {
+                // 配料任务
                 bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
                     .Where(it => it.FkWorkorder == workorder.ClientWorkorder)
                     .Any();
 
                 if (!isExist)
                 {
+                    //插入配料任务
                     MmFkWorkorderIngredient ingredient = new MmFkWorkorderIngredient();
                     ingredient.FkWorkorder = workorder.ClientWorkorder;
                     ingredient.Isingredient = 0;
@@ -120,14 +124,17 @@ namespace ZR.Service.mes.mm
                     if (ingredient != null)
                     {
                         workorder.PreviousNumber = ingredient.Remian ?? 0;
+                       
                     }
                 }
 
 
             }
+            WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
+            total= WorkorderList.Count;
+            var  returndata=  WorkorderList.Skip(query.pageNum ?? 1).Take(query.pageSize ?? 10).ToList();
 
-
-            return WorkorderList.Where(it => it.PreviousNumber > 0).Skip(1).Take(1).ToList();
+            return (returndata, total);
         }
 
         /// <summary>