diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index c4d63936..91208a0d 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; using MiniExcelLibs; using SqlSugar; using ZR.Admin.WebApi.Extensions; @@ -243,6 +244,21 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro int data = 0; if (proWorkorder != null) { + proWorkorder.PQqualifiedRate = 0; + if (!string.IsNullOrEmpty(proWorkorder.PQqualifiedRate2)) + { + try + { + { + proWorkorder.PQqualifiedRate = decimal.Parse(proWorkorder.PQqualifiedRate2.Trim()); + } + } + catch + { + proWorkorder.PQqualifiedRate = 0; + } + + } proWorkorder.ToUpdate(HttpContext); data = proWorkorderService.UpdateWorkOrder(proWorkorder); diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs index b6794461..db1212e5 100644 --- a/ZR.Model/MES/pro/ProWorkorder_v2.cs +++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs @@ -200,7 +200,7 @@ namespace ZR.Model.MES.pro [ExcelIgnore] public DateTime UpdatedTime { get; set; } - + public string PQqualifiedRate2 { get; set; } } }