diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs index 4bcddb12..ea9ad865 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs @@ -10,7 +10,7 @@ /// public List ids { get; set; } /// - /// 维修单状态 DWX(待维修)、WXZ(维修中)、YWC(已维修) + /// 维修单状态 DWX(待维修)、WXZ(维修中)、YWC(已维修)、FHZ(复核中) /// public string status { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs index a8dba99a..6bb20a79 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs @@ -85,5 +85,25 @@ public partial class ToolMoldMaintainTask : BaseEntity /// 工时(小时) /// public decimal cost_work_time { get; set; } + + /// + /// 是否复核 + /// + public int is_repeat { get; set; } + + /// + /// 复核人 + /// + public string repeater { get; set; } + + /// + /// 是否报废 + /// + public int is_scrap { get; set; } + + /// + /// 报废穴数 + /// + public int scrap_qty { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs index 3c3c79ea..ae1d634c 100644 --- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs @@ -309,12 +309,14 @@ namespace Tnb.EquipMgr { string id = dic["id"]; string executeUserId = dic["executeUserId"]; + string repeat_user_id = dic["repeat_user_id"]; EqpMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id); if (eqpSpotInsRecordH.status == "1") { _ = await _repository.UpdateAsync(x => new EqpMaintainRecordH() { execute_user_id = executeUserId, + repeat_user_id = repeat_user_id, modify_id = _userManager.UserId, modify_time = DateTime.Now }, x => x.id == id); diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index 71375c89..233286c9 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -268,12 +268,14 @@ namespace Tnb.EquipMgr { string id = dic["id"]; string spotRecordUserId = dic["spotRecordUserId"]; + string repeat_user_id = dic["repeat_user_id"]; EqpSpotInsRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id); if (eqpSpotInsRecordH.status == "1") { _ = await _repository.UpdateAsync(x => new EqpSpotInsRecordH() { spot_record_user_id = spotRecordUserId, + repeat_user_id = repeat_user_id, modify_id = _userManager.UserId, modify_time = DateTime.Now }, x => x.id == id); diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRecordService.cs index 775332e1..deef4d0f 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRecordService.cs @@ -311,12 +311,14 @@ namespace Tnb.EquipMgr { string id = dic["id"]; string executeUserId = dic["executeUserId"]; + string repeat_user_id = dic["repeat_user_id"]; ToolMoldMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id); if (eqpSpotInsRecordH.status == "1") { _ = await _repository.UpdateAsync(x => new ToolMoldMaintainRecordH() { execute_user_id = executeUserId, + repeat_user_id = repeat_user_id, modify_id = _userManager.UserId, modify_time = DateTime.Now }, x => x.id == id);