20240416 质量月报

This commit is contained in:
2024-04-16 22:18:09 +08:00
parent 81e7c7d034
commit 905b46105a
2 changed files with 24 additions and 39 deletions
@@ -2260,12 +2260,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
numberIndex = 1;
int? num1 = 0, num2 = 0;
int MonthsCountstring = 0, ProjectCountstring = 0;
decimal? num1 = 0, num2 = 0;
decimal MonthsCountstring = 0, ProjectCountstring = 0;
foreach (var item in InspectionDataInspection)
{
MonthsCountstring = Convert.ToInt32(item.RectificationRate.Replace("%", ""));
ProjectCountstring = Convert.ToInt32(item.TotationRate.Replace("%", ""));
if (!string.IsNullOrEmpty(item.RectificationRate))
{
MonthsCountstring = Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
}
if (!string.IsNullOrEmpty(item.TotationRate))
{
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
}
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
@@ -2832,8 +2838,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 23.
string imageUrl = "res/images/R-C.png";
var imageUrl1 = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl1))
if (!string.IsNullOrWhiteSpace(imageUrl1) && imageUrl1 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl1;
@@ -2856,7 +2863,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl2 = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl2))
if (!string.IsNullOrWhiteSpace(imageUrl2) && imageUrl2 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl2;
@@ -2879,7 +2886,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl3 = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl3))
if (!string.IsNullOrWhiteSpace(imageUrl3) && imageUrl3 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl3;
@@ -2902,7 +2909,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl4 = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl4))
if (!string.IsNullOrWhiteSpace(imageUrl4) && imageUrl4 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl4;
@@ -2925,7 +2932,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl5 = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl5))
if (!string.IsNullOrWhiteSpace(imageUrl5) && imageUrl5 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl5;
@@ -2948,7 +2955,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl6 = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl6))
if (!string.IsNullOrWhiteSpace(imageUrl6) && imageUrl6 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl6;