BUG
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public List<string> ids { get; set; }
|
public List<string> ids { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 维修单状态 DWX(待维修)、WXZ(维修中)、YWC(已维修)
|
/// 维修单状态 DWX(待维修)、WXZ(维修中)、YWC(已维修)、FHZ(复核中)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string status { get; set; }
|
public string status { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,5 +85,25 @@ public partial class ToolMoldMaintainTask : BaseEntity<string>
|
|||||||
/// 工时(小时)
|
/// 工时(小时)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal cost_work_time { get; set; }
|
public decimal cost_work_time { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否复核
|
||||||
|
/// </summary>
|
||||||
|
public int is_repeat { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 复核人
|
||||||
|
/// </summary>
|
||||||
|
public string repeater { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否报废
|
||||||
|
/// </summary>
|
||||||
|
public int is_scrap { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 报废穴数
|
||||||
|
/// </summary>
|
||||||
|
public int scrap_qty { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -309,12 +309,14 @@ namespace Tnb.EquipMgr
|
|||||||
{
|
{
|
||||||
string id = dic["id"];
|
string id = dic["id"];
|
||||||
string executeUserId = dic["executeUserId"];
|
string executeUserId = dic["executeUserId"];
|
||||||
|
string repeat_user_id = dic["repeat_user_id"];
|
||||||
EqpMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
EqpMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
||||||
if (eqpSpotInsRecordH.status == "1")
|
if (eqpSpotInsRecordH.status == "1")
|
||||||
{
|
{
|
||||||
_ = await _repository.UpdateAsync(x => new EqpMaintainRecordH()
|
_ = await _repository.UpdateAsync(x => new EqpMaintainRecordH()
|
||||||
{
|
{
|
||||||
execute_user_id = executeUserId,
|
execute_user_id = executeUserId,
|
||||||
|
repeat_user_id = repeat_user_id,
|
||||||
modify_id = _userManager.UserId,
|
modify_id = _userManager.UserId,
|
||||||
modify_time = DateTime.Now
|
modify_time = DateTime.Now
|
||||||
}, x => x.id == id);
|
}, x => x.id == id);
|
||||||
|
|||||||
@@ -268,12 +268,14 @@ namespace Tnb.EquipMgr
|
|||||||
{
|
{
|
||||||
string id = dic["id"];
|
string id = dic["id"];
|
||||||
string spotRecordUserId = dic["spotRecordUserId"];
|
string spotRecordUserId = dic["spotRecordUserId"];
|
||||||
|
string repeat_user_id = dic["repeat_user_id"];
|
||||||
EqpSpotInsRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
EqpSpotInsRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
||||||
if (eqpSpotInsRecordH.status == "1")
|
if (eqpSpotInsRecordH.status == "1")
|
||||||
{
|
{
|
||||||
_ = await _repository.UpdateAsync(x => new EqpSpotInsRecordH()
|
_ = await _repository.UpdateAsync(x => new EqpSpotInsRecordH()
|
||||||
{
|
{
|
||||||
spot_record_user_id = spotRecordUserId,
|
spot_record_user_id = spotRecordUserId,
|
||||||
|
repeat_user_id = repeat_user_id,
|
||||||
modify_id = _userManager.UserId,
|
modify_id = _userManager.UserId,
|
||||||
modify_time = DateTime.Now
|
modify_time = DateTime.Now
|
||||||
}, x => x.id == id);
|
}, x => x.id == id);
|
||||||
|
|||||||
@@ -311,12 +311,14 @@ namespace Tnb.EquipMgr
|
|||||||
{
|
{
|
||||||
string id = dic["id"];
|
string id = dic["id"];
|
||||||
string executeUserId = dic["executeUserId"];
|
string executeUserId = dic["executeUserId"];
|
||||||
|
string repeat_user_id = dic["repeat_user_id"];
|
||||||
ToolMoldMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
ToolMoldMaintainRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id);
|
||||||
if (eqpSpotInsRecordH.status == "1")
|
if (eqpSpotInsRecordH.status == "1")
|
||||||
{
|
{
|
||||||
_ = await _repository.UpdateAsync(x => new ToolMoldMaintainRecordH()
|
_ = await _repository.UpdateAsync(x => new ToolMoldMaintainRecordH()
|
||||||
{
|
{
|
||||||
execute_user_id = executeUserId,
|
execute_user_id = executeUserId,
|
||||||
|
repeat_user_id = repeat_user_id,
|
||||||
modify_id = _userManager.UserId,
|
modify_id = _userManager.UserId,
|
||||||
modify_time = DateTime.Now
|
modify_time = DateTime.Now
|
||||||
}, x => x.id == id);
|
}, x => x.id == id);
|
||||||
|
|||||||
Reference in New Issue
Block a user