diff --git a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
index e0e3e61..8a1f975 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
@@ -58,8 +58,8 @@ namespace DOAN.Admin.WebApi.Controllers
         [ActionPermissionFilter(Permission = "proreportwork:list")]
         public IActionResult QueryProReportwork([FromBody] ProReportworkQueryDto parm)
         {
-            parm.JobDate[0] = DOANConvertDate.ConvertLocalDate(parm.JobDate[0]);
-            parm.JobDate[1] = DOANConvertDate.ConvertLocalDate(parm.JobDate[1]);
+            parm.JobDateTime[0] = DOANConvertDate.ConvertLocalDate(parm.JobDateTime[0]);
+            parm.JobDateTime[1] = DOANConvertDate.ConvertLocalDate(parm.JobDateTime[1]);
             var response = _ProReportworkService.GetList(parm);
             return SUCCESS(response);
         }
diff --git a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
index 96e5875..39605e5 100644
--- a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
+++ b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
@@ -8,13 +8,13 @@ namespace DOAN.Model.BZFM.Dto
     {
         public string Workorder { get; set; }
 
-        public string RouteId { get; set; }
+        public int RouteId { get; set; }
 
         public int ProcessId { get; set; }
         
         public string Worker { get; set; }
 
-        public DateTime[] JobDate { get; set; } = new DateTime[2];
+        public DateTime[] JobDateTime { get; set; } = new DateTime[2];
     }
 
     /// <summary>
diff --git a/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs b/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
index 160cf71..45f012a 100644
--- a/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
+++ b/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
@@ -53,7 +53,7 @@ public class ProReportWorkDetialDto
         /// 作业日期 
         /// </summary>
 
-        public DateTime? JobDate { get; set; }
+        public DateTime? JobDateTime { get; set; }
 
         /// <summary>
         /// 备注 
diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index ecff780..936d870 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -15,12 +15,12 @@ namespace DOAN.Service.MES.product;
 [AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
 public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
 {
-    List<BaseWorkRoute> GetRoute()
+    public List<BaseWorkRoute> GetRoute()
     {
         return Context.Queryable<BaseWorkRoute>().ToList();
     
     }
-    List<BaseWorkProcesses> GetProcessByRoute(int route_id)
+   public  List<BaseWorkProcesses> GetProcessByRoute(int route_id)
     {
        return  Context.Queryable<BaseRelWorkRouteProcesses>()
             .LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id)
@@ -96,10 +96,10 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
         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.RouteCode), it => it.RouteCode == parm.RouteCode)
+                .AndIF(parm.RouteId>0, it => it.RouteId == parm.RouteId)
                 .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
-                .AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0])
-                .AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1].AddDays(1))
+                .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;
diff --git a/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs b/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
index a2d3ccd..3f16b1c 100644
--- a/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
+++ b/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
@@ -40,7 +40,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             digital.ProductionPlanQuantity = Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == DateTime.Today).Sum(it=>it.PlanNum??0);
 
 
-            digital.ProductionFinishQuantity = Context.Queryable<ProReportwork01>().Where(it => it.JobDate >= DateTime.Today && it.JobDate < DateTime.Today.AddDays(1))
+            digital.ProductionFinishQuantity = Context.Queryable<ProReportwork01>().Where(it => it.JobDateTime >= DateTime.Today && it.JobDateTime < DateTime.Today.AddDays(1))
                 .Where(it => it.ProcessId == 90).Sum(it => it.FinishNum??0);
 
 
diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs
index 8ffb13d..6aaef1c 100644
--- a/DOAN.Service/Mobile/ReportFlowService.cs
+++ b/DOAN.Service/Mobile/ReportFlowService.cs
@@ -57,7 +57,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             result = Context.Updateable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId)
                 .SetColumns(it => it.FinishNum == finish_num)
                 .SetColumns(it => it.Worker == Worker)
-                .SetColumns(it => it.JobDate == DateTime.Now)
+                .SetColumns(it => it.JobDateTime == DateTime.Now)
                  .SetColumns(it => it.RouteId == 32)
                 .SetColumns(it => it.UpdatedBy == Worker)
                 .SetColumns(it => it.UpdatedTime == DateTime.Now)
@@ -76,7 +76,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             proReportwork01.FinishNum = finish_num;
             proReportwork01.RouteId = 32;
             proReportwork01.Worker = Worker;
-            proReportwork01.JobDate = DateTime.Now;
+            proReportwork01.JobDateTime = DateTime.Now;
             proReportwork01.CreatedBy = Worker;
             proReportwork01.CreatedTime = DateTime.Now;
             result = Context.Insertable(proReportwork01).ExecuteCommand();
@@ -102,7 +102,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                 .SetColumns(it => it.BadNum == bad_num)
                 .SetColumns(it => it.Worker == Worker)
                 .SetColumns(it => it.RouteId == 32)
-                .SetColumns(it => it.JobDate == DateTime.Now)
+                .SetColumns(it => it.JobDateTime == DateTime.Now)
                 .SetColumns(it => it.UpdatedBy == Worker)
                 .SetColumns(it => it.UpdatedTime == DateTime.Now)
                 .ExecuteCommand();
@@ -118,7 +118,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             proReportwork01.BadNum = bad_num;
             proReportwork01.Worker = Worker;
             proReportwork01.RouteId = 32;
-            proReportwork01.JobDate = DateTime.Now;
+            proReportwork01.JobDateTime = DateTime.Now;
             proReportwork01.CreatedBy = Worker;
             proReportwork01.CreatedTime = DateTime.Now;
             result = Context.Insertable(proReportwork01).ExecuteCommand();
@@ -151,7 +151,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                   .SetColumns(it => it.RouteId == 32)
                 .SetColumns(it => it.BadNum == bad_num)
                 .SetColumns(it => it.Worker == Worker)
-                .SetColumns(it => it.JobDate == DateTime.Now)
+                .SetColumns(it => it.JobDateTime == DateTime.Now)
                 .SetColumns(it => it.UpdatedBy == Worker)
                 .SetColumns(it => it.UpdatedTime == DateTime.Now)
                 .ExecuteCommand();
@@ -170,7 +170,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             proReportwork01.BadNum = bad_num;
             proReportwork01.Worker = Worker;
             proReportwork01.RouteId = 32;
-            proReportwork01.JobDate = DateTime.Now;
+            proReportwork01.JobDateTime = DateTime.Now;
             proReportwork01.CreatedBy = Worker;
             proReportwork01.CreatedTime = DateTime.Now;
             result = Context.Insertable(proReportwork01).ExecuteCommand();
@@ -203,7 +203,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
 
         return Context.Queryable<ProReportwork01>()
        .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
-       .Where((rw, wp) => rw.Worker == Name && rw.JobDate >= DateTime.Today && rw.JobDate < DateTime.Today.AddDays(1))
+       .Where((rw, wp) => rw.Worker == Name && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
        .OrderBy(rw => rw.ProcessId)
        .Select((rw, wp) => new ProReportWorkDetialDto()
        {
@@ -229,7 +229,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
     {
         return Context.Queryable<ProReportwork01>()
        .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
-       .Where((rw, wp) => rw.ProcessId == processId && rw.JobDate >= DateTime.Today && rw.JobDate < DateTime.Today.AddDays(1))
+       .Where((rw, wp) => rw.ProcessId == processId && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
        .OrderBy(rw => rw.ProcessId)
        .Select((rw, wp) => new ProReportWorkDetialDto()
        {