diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index 6fc955ad..f9b81e25 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -126,10 +126,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro item.Specifications = ""; if (item.CylinderNumber == null) item.CylinderNumber = ""; - if (item.PQqualifiedNum == null) - item.PQqualifiedNum = 0; - if (item.PQqualifiedRate == null) - item.PQqualifiedRate = 0; + if (item.PQualifiedNum == null) + item.PQualifiedNum = 0; + if (item.PQualifiedRate == null) + item.PQualifiedRate = 0; if (item.Remark1 == null) item.Remark1 = ""; if (item.Remark2 == null) @@ -248,18 +248,18 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro if (parm != null) { var modal = parm.Adapt().ToUpdate(HttpContext); - modal.PQqualifiedRate = 0; - if (!string.IsNullOrEmpty(parm.PQqualifiedRate)) + modal.PQualifiedRate = 0; + if (!string.IsNullOrEmpty(parm.PQualifiedRate)) { try { { - modal.PQqualifiedRate = decimal.Parse(parm.PQqualifiedRate.Trim()); + modal.PQualifiedRate = decimal.Parse(parm.PQualifiedRate.Trim()); } } catch { - modal.PQqualifiedRate = 0; + modal.PQualifiedRate = 0; } } diff --git a/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs index e9fd3642..f17e3ceb 100644 --- a/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs +++ b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs @@ -64,12 +64,12 @@ namespace ZR.Model.DTO.MES.pro /// /// 预计合格数 /// - public int PQqualifiedNum { get; set; } + public int PQualifiedNum { get; set; } /// /// 预计合格率 /// - public string PQqualifiedRate { get; set; } + public string PQualifiedRate { get; set; } /// /// 双组号缸号 diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs index a005b807..c0d45ba5 100644 --- a/ZR.Model/MES/pro/ProWorkorder_v2.cs +++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs @@ -83,14 +83,14 @@ namespace ZR.Model.MES.pro /// [SugarColumn(ColumnName = "pqualifiednum")] [ExcelColumn(Name = "预计合格数", IndexName = "J")] - public int PQqualifiedNum { get; set; } + public int PQualifiedNum { get; set; } /// /// 预计合格率 /// [SugarColumn(ColumnName = "pqualifiedRate")] [ExcelColumn(Name = "预计合格率", IndexName = "K")] - public decimal PQqualifiedRate { get; set; } + public decimal PQualifiedRate { get; set; } /// /// 双组号缸号 diff --git a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs index 7939f626..42839e5a 100644 --- a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs @@ -56,8 +56,8 @@ namespace ZR.Service.mes.pro Colour = item.Colour, CodeNumber = item.CodeNumber, CylinderNumber = item.CylinderNumber, - PQualifiedNum = item.PQqualifiedNum, - PQualifiedRate = item.PQqualifiedRate, + PQualifiedNum = item.PQualifiedNum, + PQualifiedRate = item.PQualifiedRate, hangNumber = item.hangNumber, PreviousNumber = item.PreviousNumber, VehicleNumber = item.VehicleNumber,