diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index 6a78f6c6..3da509f2 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -12,6 +12,7 @@ using JNPF.Systems.Interfaces.System;
 using JNPF.VisualDev;
 using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Interfaces;
+using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SqlSugar;
@@ -58,29 +59,60 @@ namespace Tnb.EquipMgr
             if (!input.data.ContainsKey("create_time"))
             {
                 input.data.Add("create_time",DateTime.Now);
+            }else if ( string.IsNullOrEmpty((string)input.data["create_time"]))
+            {
+                input.data["create_time"] = DateTime.Now;
             }
             
             if (!input.data.ContainsKey("create_id"))
             {
                 input.data.Add("create_id",_userManager.UserId);
+            }else if ( string.IsNullOrEmpty((string)input.data["create_id"]))
+            {
+                input.data["create_id"] = _userManager.UserId;
             }
             
             if (!input.data.ContainsKey("apply_user_id"))
             {
                 input.data.Add("apply_user_id",_userManager.UserId);
+            }else if ( string.IsNullOrEmpty((string)input.data["apply_user_id"]))
+            {
+                input.data["apply_user_id"] = _userManager.UserId;
             }
             
             if (!input.data.ContainsKey("org_id"))
             {
                 input.data.Add("org_id",_userManager.GetUserInfo().Result.organizeId);
+            }else if ( string.IsNullOrEmpty((string)input.data["org_id"]))
+            {
+                input.data["org_id"] = _userManager.GetUserInfo().Result.organizeId;
             }
             
             if (!input.data.ContainsKey("code"))
             {
                 input.data.Add("code",await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE));
+            }else if (string.IsNullOrEmpty((string)input.data["code"]))
+            {
+                input.data["code"] = await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE);
             }
-            VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
-            await _runService.Create(templateEntity, input);
+
+            EqpRepairApply eqpRepairApply = new EqpRepairApply();
+            eqpRepairApply.code = (string)input.data["code"];
+            eqpRepairApply.name = (string)input.data["name"];
+            eqpRepairApply.equip_id = (string)input.data["equip_id"];
+            eqpRepairApply.expect_complete_time = input.data["expect_complete_time"]!=null && input.data["expect_complete_time"].ToString()!="" ? (DateTime?)input.data["expect_complete_time"] : null;
+            eqpRepairApply.is_ugent = (int?)(long)input.data["is_ugent"];
+            eqpRepairApply.attachment = (string)input.data["attachment"];
+            eqpRepairApply.apply_user_id = (string)input.data["apply_user_id"];
+            eqpRepairApply.create_id = (string)input.data["create_id"];
+            eqpRepairApply.create_time = DateTime.Now;
+            eqpRepairApply.org_id = (string)input.data["org_id"];
+            eqpRepairApply.remark = (string)input.data["remark"];
+            eqpRepairApply.description = (string)input.data["description"];
+            await _repository.InsertAsync(eqpRepairApply);
+            
+            // VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+            // await _runService.Create(templateEntity, input);
             return await Task.FromResult(true);
         }
 
@@ -209,7 +241,7 @@ namespace Tnb.EquipMgr
         {
             
             EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==input.id);
-            if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED)
+            if (eqpRepairApply.status == RepairApplyStatus.RECEIVED)
             {
                 if (_userManager.UserId == eqpRepairApply.repairer_id)
                 {