Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

生产队列

Browse Source
This commit is contained in:
quowingwang
2025-12-16 09:25:04 +08:00
parent b1f545cf7d
commit ce19f330a3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
View File

@@ -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<ProWorkorder_v2>().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;
}
}

4
ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs
View File

@@ -64,12 +64,12 @@ namespace ZR.Model.DTO.MES.pro
/// <summary>
/// 预计合格数
/// </summary>
public int PQqualifiedNum { get; set; }
public int PQualifiedNum { get; set; }
/// <summary>
/// 预计合格率
/// </summary>
public string PQqualifiedRate { get; set; }
public string PQualifiedRate { get; set; }
/// <summary>
/// 双组号缸号

4
ZR.Model/MES/pro/ProWorkorder_v2.cs
View File

@@ -83,14 +83,14 @@ namespace ZR.Model.MES.pro
/// </summary>
[SugarColumn(ColumnName = "pqualifiednum")]
[ExcelColumn(Name = "预计合格数", IndexName = "J")]
public int PQqualifiedNum { get; set; }
public int PQualifiedNum { get; set; }
/// <summary>
/// 预计合格率
/// </summary>
[SugarColumn(ColumnName = "pqualifiedRate")]
[ExcelColumn(Name = "预计合格率", IndexName = "K")]
public decimal PQqualifiedRate { get; set; }
public decimal PQualifiedRate { get; set; }
/// <summary>
/// 双组号缸号

4
ZR.Service/mes/pro/ProWorkorderServiceV2.cs
View File

@@ -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,