diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index 9e951a3..11b0f0d 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -5,8 +5,6 @@ using DOAN.Repository;
 using DOAN.Service.MES.product.IService;
 using Infrastructure.Attribute;
 
-
-
 namespace DOAN.Service.MES.product;
 
 /// <summary>
@@ -18,7 +16,6 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     public List<BaseWorkRoute> GetRoute()
     {
         return Context.Queryable<BaseWorkRoute>().ToList();
-    
     }
 
     /// <summary>
@@ -27,16 +24,19 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     /// <returns></returns>
     public List<BaseWorkProcesses> GetBaseWorkProcesses()
     {
-		return Context.Queryable<BaseWorkProcesses>().ToList();
-	}
-   public  List<BaseWorkProcesses> GetProcessByRoute(int route_id)
+        return Context.Queryable<BaseWorkProcesses>().ToList();
+    }
+
+    public List<BaseWorkProcesses> GetProcessByRoute(int route_id)
     {
-       return  Context.Queryable<BaseRelWorkRouteProcesses>()
-            .LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id)
-            .Where((rel,pro)=>rel.FkWorkRoute==route_id)
-            .Select((rel,pro)=>pro)
+        return Context
+            .Queryable<BaseRelWorkRouteProcesses>()
+            .LeftJoin<BaseWorkProcesses>((rel, pro) => rel.FkWorkProcesses == pro.Id)
+            .Where((rel, pro) => rel.FkWorkRoute == route_id)
+            .Select((rel, pro) => pro)
             .ToList();
     }
+
     /// <summary>
     ///     查询报工列表
     /// </summary>
@@ -46,21 +46,17 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     {
         var predicate = QueryExp(parm);
 
-        var query = Queryable()
-            .Where(predicate.ToExpression());
-        var response = Context.Queryable(query).LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
-            .OrderBy((q,w)=>new { q.Workorder ,w.Id})
-            .Select((q, w) => new ProReportworkDto
-                {
-                    ProcessName = w.Name
-                }, true
-            )
+        var query = Queryable().Where(predicate.ToExpression());
+        var response = Context
+            .Queryable(query)
+            .LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
+            .OrderBy((q, w) => new { q.Workorder, w.Id })
+            .Select((q, w) => new ProReportworkDto { ProcessName = w.Name }, true)
             .ToPage_NO_Convert(parm);
 
         return response;
     }
 
-
     /// <summary>
     /// 获取详情
     /// </summary>
@@ -68,9 +64,7 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     /// <returns></returns>
     public ProReportwork01 GetInfo(string Id)
     {
-        var response = Queryable()
-            .Where(x => x.Id == Id)
-            .First();
+        var response = Queryable().Where(x => x.Id == Id).First();
 
         return response;
     }
@@ -83,11 +77,13 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     public ProReportwork01 AddProReportwork(ProReportwork01 model)
     {
         //出货工序
-        if(model.ProcessId== 90&& !string.IsNullOrEmpty(model.Workorder))
+        if (model.ProcessId == 90 && !string.IsNullOrEmpty(model.Workorder))
         {
-            Context.Updateable<ProWorkorder>()
+            Context
+                .Updateable<ProWorkorder>()
                 .SetColumns(it => it.ShipmentNum == model.FinishNum)
-                .Where(it => it.Workorder == model.Workorder).ExecuteCommand();
+                .Where(it => it.Workorder == model.Workorder)
+                .ExecuteCommand();
         }
 
         return Insertable(model).ExecuteReturnEntity();
@@ -103,9 +99,11 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
         //出货工序
         if (model.ProcessId == 90 && !string.IsNullOrEmpty(model.Workorder))
         {
-            Context.Updateable<ProWorkorder>()
+            Context
+                .Updateable<ProWorkorder>()
                 .SetColumns(it => it.ShipmentNum == model.FinishNum)
-                .Where(it => it.Workorder == model.Workorder).ExecuteCommand();
+                .Where(it => it.Workorder == model.Workorder)
+                .ExecuteCommand();
         }
         return Update(model, true);
     }
@@ -117,20 +115,25 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     /// <returns></returns>
     private static Expressionable<ProReportwork01> QueryExp(ProReportworkQueryDto parm)
     {
-        var predicate = Expressionable.Create<ProReportwork01>()
-                .AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
-				//.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
-				.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker==parm.Worker)
-				.AndIF(parm.RouteId>0, it => it.RouteId == parm.RouteId)
-                .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
-                .AndIF(parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue, it => it.JobDateTime >= parm.JobDateTime[0])
-                .AndIF(parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue, it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1))
-            ;
+        var predicate = Expressionable
+            .Create<ProReportwork01>()
+            .AndIF(
+                !string.IsNullOrEmpty(parm.Workorder),
+                it => it.Workorder.Contains(parm.Workorder)
+            )
+            //.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
+            .AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
+            .AndIF(parm.RouteId > 0, it => it.RouteId == parm.RouteId)
+            .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
+            .AndIF(
+                parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue,
+                it => it.JobDateTime >= parm.JobDateTime[0]
+            )
+            .AndIF(
+                parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue,
+                it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1)
+            );
 
         return predicate;
     }
-
-
-
-
-}
\ No newline at end of file
+}