diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index a7fa73ed..7cd7ade4 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -113,7 +113,7 @@ namespace Tnb.EquipMgr eqpRepairApply.org_id = (string)input.data["org_id"]; eqpRepairApply.remark = input.data.ContainsKey("remark") ? (string)input.data["remark"] : ""; eqpRepairApply.description = input.data.ContainsKey("description") ? (string)input.data["description"] : ""; - eqpRepairApply.status = RepairApplyStatus.TOBEEXECUTED; + eqpRepairApply.status = RepairApplyStatus.TOBERECEIVED; _ = await _repository.InsertAsync(eqpRepairApply); @@ -164,7 +164,7 @@ namespace Tnb.EquipMgr { throw Oops.Bah("状态错误"); } - + } [HttpPost] @@ -194,7 +194,7 @@ namespace Tnb.EquipMgr string id = dic["id"]; EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id); - if (eqpRepairApply.status == RepairApplyStatus.TOBEEXECUTED) + if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED) { if (await _repository.AsSugarClient().Queryable().AnyAsync(x => x.UserId == _userManager.UserId && x.ObjectId == "26586914497557")) { @@ -364,7 +364,7 @@ namespace Tnb.EquipMgr switch (input.status) { case "1": - statusList.Add(RepairApplyStatus.TOBEEXECUTED); + statusList.Add(RepairApplyStatus.TOBERECEIVED); statusList.Add(RepairApplyStatus.REFUSE); break; case "2": @@ -374,6 +374,7 @@ namespace Tnb.EquipMgr statusList.Add(RepairApplyStatus.APPROVEPASS); statusList.Add(RepairApplyStatus.APPROVENOTPASS); statusList.Add(RepairApplyStatus.TOBEOUTAPPLY); + statusList.Add(RepairApplyStatus.REFUSE); break; case "3": statusList.Add(RepairApplyStatus.COMPLETED); @@ -436,7 +437,7 @@ namespace Tnb.EquipMgr EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == input.id); if (eqpRepairApply.status == RepairApplyStatus.REPEATCHECKING) { - string status = input.repeat_result=="1" ? RepairApplyStatus.COMPLETED : RepairApplyStatus.TOBEEXECUTED; + string status = input.repeat_result=="1" ? RepairApplyStatus.COMPLETED : RepairApplyStatus.TOBERECEIVED; await _repository.AsSugarClient().Updateable() .SetColumns(x => x.repeat_result == input.repeat_result) .SetColumns(x => x.repeat_descrip == input.repeat_descrip)