diff --git a/Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs b/Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs
index 83ec2185..bc2c12dd 100644
--- a/Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs
+++ b/Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs
@@ -76,12 +76,13 @@ public class ClassificationScheme : EntityBase
     /// <param name="designerFullName"></param>
     /// <param name="designerPhone"></param>
     /// <param name="workshopId"></param>
-    public void Edit(DateTime includingDateGr, DateTime executionDateGr,string designerFullName, string designerPhone, long workshopId)
+    public void Edit(DateTime includingDateGr, DateTime executionDateGr,string designerFullName, string designerPhone, TypeOfCoefficient typeOfCoefficient)
     {
         IncludingDateGr = includingDateGr;
         ExecutionDateGr = executionDateGr;
         DesignerFullName = designerFullName;
         DesignerPhone = designerPhone;
-        WorkshopId = workshopId;
+        TypeOfCoefficient = typeOfCoefficient;
+
     }
 }
\ No newline at end of file
diff --git a/Company.Domain/ClassificationSchemeAgg/IClassificationGroupRepository.cs b/Company.Domain/ClassificationSchemeAgg/IClassificationGroupRepository.cs
new file mode 100644
index 00000000..c68e31f4
--- /dev/null
+++ b/Company.Domain/ClassificationSchemeAgg/IClassificationGroupRepository.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationGroupRepository : IRepository<long, ClassificationGroup>
+{
+    Task<ClassificationGroupAndJobModel> GetGroups(long schemeId);
+
+    /// <summary>
+    /// ایجاد گروه های بیست گانه
+    /// </summary>
+    /// <param name="groupList"></param>
+    /// <returns></returns>
+    Task CreateGroups(List<ClassificationGroup> groupList);
+}
\ No newline at end of file
diff --git a/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs b/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs
index dc6943c9..5862352d 100644
--- a/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs
+++ b/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs
@@ -16,9 +16,11 @@ public interface IClassificationSchemeRepository : IRepository<long, Classificat
 
 
     /// <summary>
-    /// ایجاد طرح
+    /// دریافت اطلاعات طرح برای ویرایش
     /// </summary>
-    /// <param name="command"></param>
+    /// <param name="id"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateClassificationScheme(CreateClassificationScheme command);
+    Task<EditClassificationScheme> GetClassificationScheme(long id);
+
+
 }
\ No newline at end of file
diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationGroup.cs b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
similarity index 96%
rename from CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationGroup.cs
rename to CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
index ccff09bd..f96bad66 100644
--- a/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationGroup.cs
+++ b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
@@ -5,7 +5,7 @@ namespace CompanyManagment.App.Contracts.ClassificationScheme;
 /// <summary>
 /// ایجاد گروه
 /// </summary>
-public class CreateClassificationGroup
+public class ClassificationGroupAndJobModel
 {
     /// <summary>
     /// شماره گروه
diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs b/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs
index 43fd45cc..2454a813 100644
--- a/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs
+++ b/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs
@@ -23,6 +23,13 @@ public interface IClassificationSchemeApplication
     /// <returns></returns>
     Task<OperationResult> CreateClassificationScheme(CreateClassificationScheme command);
 
+    /// <summary>
+    /// دریافت اطلاعات طرح برای مودال ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<EditClassificationScheme> GetClassificationScheme(long id);
+
     /// <summary>
     /// ویرایش طرح
     /// </summary>
@@ -35,7 +42,7 @@ public interface IClassificationSchemeApplication
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateGroupJobs(CreateClassificationGroup command);
+    Task<OperationResult> CreateGroupJobs(ClassificationGroupAndJobModel command);
     
     /// <summary>
     /// ایجاد دستمزدها و ضرایب ریالی هر گروه در هر سال
diff --git a/CompanyManagment.Application/ClassificationSchemeApplication.cs b/CompanyManagment.Application/ClassificationSchemeApplication.cs
index ebee3c43..cfef7cc2 100644
--- a/CompanyManagment.Application/ClassificationSchemeApplication.cs
+++ b/CompanyManagment.Application/ClassificationSchemeApplication.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.ClassificationSchemeAgg;
@@ -9,10 +10,12 @@ namespace CompanyManagment.Application;
 public class ClassificationSchemeApplication : IClassificationSchemeApplication
 {
     private readonly IClassificationSchemeRepository _classificationSchemeRepository;
+    private readonly IClassificationGroupRepository _classificationGroupRepository;
 
-    public ClassificationSchemeApplication(IClassificationSchemeRepository classificationSchemeRepository)
+    public ClassificationSchemeApplication(IClassificationSchemeRepository classificationSchemeRepository, IClassificationGroupRepository classificationGroupRepository)
     {
         _classificationSchemeRepository = classificationSchemeRepository;
+        _classificationGroupRepository = classificationGroupRepository;
     }
 
     public Task<ClassificationSchemePartialModel> ClassificationSchemePartialModel(long workshopId)
@@ -38,20 +41,76 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication
         
 
         #endregion
-
+        //ایجاد طرح
         var create = new ClassificationScheme(command.IncludingDateGr, command.ExecutionDateGr,
             command.DesignerFullName, command.DesignerPhone, command.WorkshopId, command.TypeOfCoefficient);
         _classificationSchemeRepository.Create(create);
         await _classificationSchemeRepository.SaveChangesAsync();
+        //ایجاد گروه های طرح
+        var groups = new List<ClassificationGroup>()
+        {
+            new ClassificationGroup("1",command.WorkshopId,create.id),
+            new ClassificationGroup("2",command.WorkshopId,create.id),
+            new ClassificationGroup("3",command.WorkshopId,create.id),
+            new ClassificationGroup("4",command.WorkshopId,create.id),
+            new ClassificationGroup("5",command.WorkshopId,create.id),
+            new ClassificationGroup("6",command.WorkshopId,create.id),
+            new ClassificationGroup("7",command.WorkshopId,create.id),
+            new ClassificationGroup("8",command.WorkshopId,create.id),
+            new ClassificationGroup("9",command.WorkshopId,create.id),
+            new ClassificationGroup("10",command.WorkshopId,create.id),
+            new ClassificationGroup("11",command.WorkshopId,create.id),
+            new ClassificationGroup("12",command.WorkshopId,create.id),
+            new ClassificationGroup("13",command.WorkshopId,create.id),
+            new ClassificationGroup("14",command.WorkshopId,create.id),
+            new ClassificationGroup("15",command.WorkshopId,create.id),
+            new ClassificationGroup("16",command.WorkshopId,create.id),
+            new ClassificationGroup("17",command.WorkshopId,create.id),
+            new ClassificationGroup("18",command.WorkshopId,create.id),
+            new ClassificationGroup("19",command.WorkshopId,create.id),
+            new ClassificationGroup("20",command.WorkshopId,create.id),
+        };
+
+        await _classificationGroupRepository.CreateGroups(groups);
+
+
+
         return op.Succcedded();
     }
 
-    public Task<OperationResult> EditClassificationScheme(EditClassificationScheme command)
+    public Task<EditClassificationScheme> GetClassificationScheme(long id)
     {
-        throw new System.NotImplementedException();
+        return _classificationSchemeRepository.GetClassificationScheme(id);
     }
 
-    public Task<OperationResult> CreateGroupJobs(CreateClassificationGroup command)
+    public async Task<OperationResult> EditClassificationScheme(EditClassificationScheme command)
+    {
+        var op = new OperationResult();
+
+        try
+        {
+            command.ExecutionDateGr = command.ExecutionDateFa.ToGeorgianDateTime();
+            command.IncludingDateGr = command.IncludingDateFa.ToGeorgianDateTime();
+        }
+        catch (Exception e)
+        {
+            return op.Failed("تاریخ به درستی وارد نشده است");
+        }
+        #region Validation
+
+
+
+        #endregion
+        var scheme = _classificationSchemeRepository.Get(command.Id);
+        if (scheme == null)
+            return op.Failed("رکورد مورد نظر وجود ندارد");
+
+        scheme.Edit(command.IncludingDateGr,command.ExecutionDateGr,command.DesignerFullName,command.DesignerPhone,command.TypeOfCoefficient);
+        await _classificationSchemeRepository.SaveChangesAsync();
+        return op.Succcedded();
+    }
+
+    public Task<OperationResult> CreateGroupJobs(ClassificationGroupAndJobModel command)
     {
         throw new System.NotImplementedException();
     }
diff --git a/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs b/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs
new file mode 100644
index 00000000..3fdfa565
--- /dev/null
+++ b/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.InfraStructure;
+using Company.Domain.ClassificationSchemeAgg;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+using Microsoft.EntityFrameworkCore;
+
+namespace CompanyManagment.EFCore.Repository;
+
+public class ClassificationGroupRepository : RepositoryBase<long, ClassificationGroup>, IClassificationGroupRepository
+{
+    private readonly CompanyContext _context;
+    public ClassificationGroupRepository(CompanyContext context) : base(context)
+    {
+        _context = context;
+    }
+
+    public Task<ClassificationGroupAndJobModel> GetGroups(long schemeId)
+    {
+        throw new System.NotImplementedException();
+    }
+
+    /// <summary>
+    /// ایجاد گروه های بیست گانه
+    /// </summary>
+    /// <param name="groupList"></param>
+    /// <returns></returns>
+    public async Task CreateGroups(List<ClassificationGroup> groupList)
+    {
+       await _context.AddRangeAsync(groupList);
+       await _context.SaveChangesAsync();
+    }
+}
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs b/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs
index e4f87765..ba0ee0ed 100644
--- a/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs
+++ b/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs
@@ -51,6 +51,31 @@ public class ClassificationSchemeRepository :RepositoryBase<long, Classification
 
     }
 
+    /// <summary>
+    /// دریافت اطلاعات طرح برای ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public Task<EditClassificationScheme> GetClassificationScheme(long id)
+    {
+       return _context.ClassificationSchemes.Select(x =>
+            new EditClassificationScheme()
+            {
+
+                Id = x.id,
+                WorkshopId = x.WorkshopId,
+                IncludingDateGr = x.IncludingDateGr,
+                ExecutionDateGr = x.ExecutionDateGr,
+                EndSchemeDateGr = x.EndSchemeDateGr,
+                IncludingDateFa = x.IncludingDateGr.ToFarsi(),
+                ExecutionDateFa = x.ExecutionDateGr.ToFarsi(),
+                DesignerFullName = x.DesignerFullName,
+                DesignerPhone = x.DesignerPhone,
+                TypeOfCoefficient = x.TypeOfCoefficient
+
+            }).FirstOrDefaultAsync(x => x.Id == id);
+    }
+
     public Task<OperationResult> CreateClassificationScheme(CreateClassificationScheme command)
     {
         throw new System.NotImplementedException();
diff --git a/PersonalContractingParty.Config/PersonalBootstrapper.cs b/PersonalContractingParty.Config/PersonalBootstrapper.cs
index 1794058a..12ed81bc 100644
--- a/PersonalContractingParty.Config/PersonalBootstrapper.cs
+++ b/PersonalContractingParty.Config/PersonalBootstrapper.cs
@@ -502,6 +502,9 @@ public class PersonalBootstrapper
         services.AddTransient<IClassificationSchemeApplication, ClassificationSchemeApplication>();
         services.AddTransient<IClassificationSchemeRepository, ClassificationSchemeRepository>();
 
+
+        services.AddTransient<IClassificationGroupRepository, ClassificationGroupRepository>();
+
         #endregion
         //=========End Of Main====================================
 
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
index ca0c01ed..1bcfaded 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
@@ -63,6 +63,27 @@ public class ClassificationSchemeModel : PageModel
         return new JsonResult(result);
     }
 
+    /// <summary>
+    /// لود مودال ویرایش طرح
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public IActionResult OnGetEditScheme(long id)
+    {
+        var model = _classificationSchemeApplication.GetClassificationScheme(id).GetAwaiter().GetResult();
+        return Partial("_ClassificationPartials/EditScheme", model);
+    }
+
+    /// <summary>
+    /// ویرایش طرح
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    public async Task<JsonResult> OnPostEditScheme(EditClassificationScheme command)
+    {
+        var result = _classificationSchemeApplication.EditClassificationScheme(command).GetAwaiter().GetResult();
+        return new JsonResult(result);
+    }
     public IActionResult OnGetCreateJobs()
     {
         return Partial("_ClassificationPartials/CreateClassificationGroupJobs");
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml
index 8fc24974..93251c53 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml
@@ -102,8 +102,8 @@
                             </span>
                               
                         </a>
-                    
-                        <a href="#">
+
+                        <a href="#showmodal=@Url.Page("./ClassificationScheme", "EditScheme" ,new {id = item.Id})">
                             <span class="icon-span" style="background-color:#ade7f2">
                                 <svg width="19" height="18" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg" >
                                     <rect width="18.5047" height="18.5047" transform="translate(0.074707 0.679688)" fill="#ADE7F2"></rect>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/CreateScheme.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/CreateScheme.cshtml
index 58e581cf..1639536b 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/CreateScheme.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/CreateScheme.cshtml
@@ -26,7 +26,7 @@
         <div class="card shadow-sm border-0">
             <div class="card-body">
 
-                <!-- ردیف اول -->
+     
                 <div class="row">
                     <div class="col-md-6 mb-3">
                         <label asp-for="DesignerFullName" class="form-label">نام طراح</label>
@@ -40,7 +40,7 @@
                     </div>
                 </div>
 
-                <!-- ردیف دوم -->
+     
                 <div class="row m-t-10" >
                     <div class="col-md-6 mb-3">
                         <label asp-for="IncludingDateFa" class="form-label">تاریخ شمول طرح</label>
@@ -54,7 +54,7 @@
                     </div>
                 </div>
                 <div class="lineDiv"></div>
-                <!-- ردیف سوم -->
+
                 <div class="row m-t-10">
                     <div class="col-md-6 mb-3">
                         <div class="form-control" style="border-color:#fff !important;">
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/EditScheme.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/EditScheme.cshtml
new file mode 100644
index 00000000..3ee5b793
--- /dev/null
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/EditScheme.cshtml
@@ -0,0 +1,87 @@
+@using _0_Framework.Application.Enums
+@model CompanyManagment.App.Contracts.ClassificationScheme.EditClassificationScheme
+
+@{
+    <style>
+        .modal-footer {
+            padding: 0.5rem 1rem !important; /* کوچکتر کردن فاصله */
+            margin-top: -10px; /* کمی بالا آوردن */
+        }
+
+        .modal .modal-dialog .modal-content {
+            padding-bottom: 10px;
+        }
+    </style>
+}
+<div class="modal-header">
+    <h5 class="modal-title"> ویرایش طرح </h5>
+    <button type="button" class="close" data-dismiss="modal" aria-label="بستن">
+        <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+
+<form asp-page="./ClassificationScheme" asp-page-handler="EditScheme" method="post" autocomplete="off"
+      data-ajax="true" data-action="Refresh" enctype="multipart/form-data">
+    <div class="modal-body">
+
+        <div class="card shadow-sm border-0">
+            <div class="card-body">
+
+     
+                <div class="row">
+                    <div class="col-md-6 mb-3">
+                        <label asp-for="DesignerFullName" class="form-label">نام طراح</label>
+                        <input asp-for="DesignerFullName" class="form-control" />
+                        <span asp-validation-for="DesignerFullName" class="text-danger"></span>
+                    </div>
+                    <div class="col-md-6 mb-3">
+                        <label asp-for="DesignerPhone" class="form-label">شماره تماس طراح</label>
+                        <input asp-for="DesignerPhone" class="form-control" />
+                        <span asp-validation-for="DesignerPhone" class="text-danger"></span>
+                    </div>
+                </div>
+
+        
+                <div class="row m-t-10">
+                    <div class="col-md-6 mb-3">
+                        <label asp-for="IncludingDateFa" class="form-label">تاریخ شمول طرح</label>
+                        <input type="text" asp-for="IncludingDateFa" class="form-control" style="text-align: center" />
+                        <span asp-validation-for="IncludingDateFa" class="text-danger"></span>
+                    </div>
+                    <div class="col-md-6 mb-3">
+                        <label asp-for="ExecutionDateFa" class="form-label">تاریخ اجرای طرح</label>
+                        <input type="text" asp-for="ExecutionDateFa" class="form-control" style="text-align: center" />
+                        <span asp-validation-for="ExecutionDateFa" class="text-danger"></span>
+                    </div>
+                </div>
+                <div class="lineDiv"></div>
+
+                <div class="row m-t-10">
+                    <div class="col-md-6 mb-3">
+                        <div class="form-control" style="border-color:#fff !important;">
+                            <label asp-for="TypeOfCoefficient" class="form-label" style="float: left;">نوع محاسبه ضریب ریالی</label>
+                        </div>
+
+                    </div>
+                    <div class="col-md-6 mb-3">
+
+                        <select asp-for="TypeOfCoefficient" class="form-select form-control">
+                            <option value="@((int)TypeOfCoefficient.RialCoefficient)">ضریب ریالی طرح</option>
+                            <option value="@((int)TypeOfCoefficient.JobOrganization)">ضریب شورای عالی کار</option>
+                        </select>
+                        <span asp-validation-for="TypeOfCoefficient" class="text-danger"></span>
+                    </div>
+
+                </div>
+                <div class="lineDiv"></div>
+            </div>
+        </div>
+
+    </div>
+    <input type="hidden" asp-for="WorkshopId" value="@Model.WorkshopId" />
+    <input type="hidden" asp-for="Id" value="@Model.Id" />
+    <div class="modal-footer border-0">
+        <button type="submit" class="btn btn-success px-4 rounded-pill">ذخیره</button>
+        <button type="button" class="btn btn-outline-secondary px-4 rounded-pill" data-dismiss="modal">بستن</button>
+    </div>
+</form>