diff --git a/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
index 0373a82..813d3b0 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
@@ -88,6 +88,15 @@ namespace DOAN.Admin.WebApi.Controllers
             return ToResponse(response);
         }
 
+        //TODO  获取班组
+        [HttpGet("get_group")]
+        public IActionResult GetGroup(string group_code,string group_name)
+        {
+            var response = _GroupScheduleService.GetALLGroup(group_code,group_name);
+
+            return SUCCESS(response);
+        }
+
 
         /// <summary>
         /// 1 根据日期获取班组
@@ -149,7 +158,6 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-
         /// <summary>
         /// //TODO  查询班组绑定的人员
         /// </summary>
@@ -200,7 +208,6 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-
         //TODO 班组删除人员
         [HttpGet("delete_person")]
         public IActionResult GroupRemovePerson(string group_schedule_id, string person_id)
@@ -216,7 +223,6 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-
         //TODO  获取月份的排班情况
         /// <summary>
         /// 获取月份的排班情况
@@ -275,8 +281,5 @@ namespace DOAN.Admin.WebApi.Controllers
             var response = _GroupScheduleService.GetSkillsOFperson(person_id, route_id);
             return SUCCESS(response);
         }
-
-
-
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs b/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
index beadc0b..ca3a5fe 100644
--- a/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
+++ b/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
@@ -6,8 +6,7 @@ namespace DOAN.Model.MES.group.Dto
     /// 排班查询对象
     /// </summary>
     public class GroupScheduleQueryDto : PagerInfo 
-    {
-    }
+    {}
     public class GroupScheduleQueryDto2 : PagerInfo
     {
         public DateTime ScheduleDate { get; set; }
@@ -27,7 +26,6 @@ namespace DOAN.Model.MES.group.Dto
     /// </summary>
     public class GroupScheduleDto
     {
-      
         public string Id { get; set; }
 
         public DateTime ScheduleDate { get; set; }
@@ -36,7 +34,6 @@ namespace DOAN.Model.MES.group.Dto
 
         public string GroupCode { get; set; }
 
-        public string  FkBelongRouteCode { get; set; }
 
         public int FkShift { get; set; }
         public string ShiftName { get; set; }
@@ -52,8 +49,5 @@ namespace DOAN.Model.MES.group.Dto
         public string UpdatedBy { get; set; }
 
         public DateTime? UpdatedTime { get; set; }
-
-
-
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/group/GroupSchedule.cs b/DOAN.Model/MES/group/GroupSchedule.cs
index 55b46d8..3a49fe5 100644
--- a/DOAN.Model/MES/group/GroupSchedule.cs
+++ b/DOAN.Model/MES/group/GroupSchedule.cs
@@ -31,13 +31,7 @@ namespace DOAN.Model.MES.group
         [SugarColumn(ColumnName = "group_code")]
         public string GroupCode { get; set; }
 
-        /// <summary>
-        /// 归属线 
-        /// </summary>
-        [SugarColumn(ColumnName = "fk_belong_route_code")]
-        public string   FkBelongRouteCode { get; set; }
 
-      
         /// <summary>
         /// 班次 
         /// </summary>
@@ -77,6 +71,5 @@ namespace DOAN.Model.MES.group
         /// </summary>
         [SugarColumn(ColumnName = "uPDATED_TIME")]
         public DateTime? UpdatedTime { get; set; }
-
     }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/group/GroupScheduleService.cs b/DOAN.Service/MES/group/GroupScheduleService.cs
index e90f24d..80e6209 100644
--- a/DOAN.Service/MES/group/GroupScheduleService.cs
+++ b/DOAN.Service/MES/group/GroupScheduleService.cs
@@ -88,6 +88,7 @@ namespace DOAN.Service.Business
             //return response;
             return Update(model, true);
         }
+
         /// <summary>
         /// 1 根据日期获取班组
         /// </summary>
@@ -102,6 +103,7 @@ namespace DOAN.Service.Business
 
 
         }
+
         /// <summary>
         /// 查询班组绑定的人员
         /// </summary>
@@ -159,6 +161,15 @@ namespace DOAN.Service.Business
 
         }
 
+
+        public List<BaseGroup> GetALLGroup(string group_code, string group_name)
+        {
+            return Context.Queryable<BaseGroup>()
+                .WhereIF(!string.IsNullOrEmpty(group_code),it=>it.GroupCode.Contains(group_code))
+                .WhereIF(!string.IsNullOrEmpty(group_name),it=>it.GroupName.Contains(group_name))
+                .ToList();
+        }
+
         public int GroupAddPerson(string group_schedule_id, string person_id, string CreatedBy)
         {
             GroupRelPersonGroup relPersonGroup = new GroupRelPersonGroup();
@@ -176,6 +187,7 @@ namespace DOAN.Service.Business
                   .Where(it => it.FkPersonId == person_id)
                   .ExecuteCommand();
         }
+
         /// <summary>
         /// 获取本月排班情况
         /// </summary>
diff --git a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
index 1da589a..e09660c 100644
--- a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
+++ b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
@@ -10,7 +10,9 @@ namespace DOAN.Service.group.IService
     /// <summary>
     /// 排班service接口
     /// </summary>
-    public interface IGroupScheduleService : IBaseService<GroupSchedule>
+    public interface 
+        
+        IGroupScheduleService : IBaseService<GroupSchedule>
     {
         PagedInfo<GroupScheduleDto> GetList(GroupScheduleQueryDto parm);
 
@@ -24,6 +26,8 @@ namespace DOAN.Service.group.IService
 
         List<GroupPersonDto>  SearchPerson_group_bind(string group_schedule_id);
         PagedInfo<GroupPersonDto> SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm);
+
+        List<BaseGroup> GetALLGroup(string group_code,string group_name);
         int GroupAddPerson(string group_schedule_id, string person_id, string CreatedBy);
         int GroupRemovePerson(string group_schedule_id, string person_id);
 
@@ -31,9 +35,9 @@ namespace DOAN.Service.group.IService
 
         int CopyPreDaySchedule(DateTime date, string CreatedBy);
 
-       List<BaseWorkRoute> GetAllRoutes();
+        List<BaseWorkRoute> GetAllRoutes();
 
 
-       List<GroupPersonOfSkillDto> GetSkillsOFperson(string person_id, int route_id);
+        List<GroupPersonOfSkillDto> GetSkillsOFperson(string person_id, int route_id);
     }
 }
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index 2174135..dcf6845 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -919,8 +919,13 @@ namespace DOAN.Service.MES.product
 
         }
 
+        public List<BaseWorkRoute> GetProcessRoute(DateTime dateTime)
+        {
+            throw new NotImplementedException();
+        }
 
-        /// <summary>
+
+        /*/// <summary>
         /// 获取工艺路线
         /// </summary>
         /// <param name="dateTime"></param>
@@ -936,7 +941,7 @@ namespace DOAN.Service.MES.product
                  .Select((q, p) => p)
                  .Distinct()
                  .ToList();
-        }
+        }*/
 
 
         public List<BaseWorkRoute> GetAllRoute()
@@ -950,12 +955,17 @@ namespace DOAN.Service.MES.product
         /// </summary>
         /// <param name="route_code"></param>
         /// <returns></returns>
-        public List<GroupSchedule> GetGroupList(string route_code, DateTime dateTime)
+        /*public List<GroupSchedule> GetGroupList(string route_code, DateTime dateTime)
         {
             dateTime = dateTime.ToLocalTime().Date;
             return Context.Queryable<GroupSchedule>().Where(it => it.FkBelongRouteCode == route_code)
                 .Where(it => it.ScheduleDate == dateTime)
                 .ToList();
+        }*/
+
+        public List<GroupSchedule> GetGroupList(string route_code, DateTime dateTime)
+        {
+            throw new NotImplementedException();
         }
 
         public List<BaseGroup> GetGroupList()