lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量管理，NCR汇总报错问题处理

This commit is contained in:
夏菊 2025-07-23 11:10:19 +08:00
parent 08df59d881
commit a6413b7b7c
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
View File

@ -107,7 +107,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
NCRStatisc.CheckNum = managementList.Count(); NCRStatisc.CheckNum = managementList.Count();
//NCRStatisc.OKNum = managementList.Count(x => x.Status == "3"); //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
//NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3"); //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
int okNum = managementList.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.OKNum = okNum; NCRStatisc.OKNum = okNum;
NCRStatisc.NotOKNum = managementList.Count() - okNum; NCRStatisc.NotOKNum = managementList.Count() - okNum;
NCRStatisc.Remark = ""; NCRStatisc.Remark = "";

8
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
View File

@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
//this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"]; //this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
// this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"]; // this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"]; this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"];
this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["enddate"]; this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["enddate"];
//this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00");
@ -929,8 +929,10 @@ namespace FineUIPro.Web.CQMS.ManageReport
NCRStatisc.WorkName = item.UnitName; NCRStatisc.WorkName = item.UnitName;
//NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
//NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.CheckNum = AllList.Count(); NCRStatisc.CheckNum = AllList.Count();
if (NCRStatisc.CheckNum != 0)//被除数不能为零 if (NCRStatisc.CheckNum != 0)//被除数不能为零
{ {

31
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
View File

@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
select x).ToList(); select x).ToList();
if (constructionProblemsLists.Count>0) if (constructionProblemsLists.Count > 0)
{ {
gvConstructionProblems.Hidden = false; gvConstructionProblems.Hidden = false;
gvConstructionProblems.DataSource = constructionProblemsLists; gvConstructionProblems.DataSource = constructionProblemsLists;
@ -146,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
select x).ToList(); select x).ToList();
if (nextQualityControlLists.Count>0) if (nextQualityControlLists.Count > 0)
{ {
gvNextQualityControl.Hidden = false; gvNextQualityControl.Hidden = false;
gvNextQualityControl.DataSource = nextQualityControlLists; gvNextQualityControl.DataSource = nextQualityControlLists;
@ -890,12 +890,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
c.PressurePipeNumber c.PressurePipeNumber
}; };
var AllList = query.ToList(); var AllList = query.ToList();
var monethCount = query var monethCount = query
.Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString(); model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName; model.ContentName = item.UnitName;
model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber)); model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber));
model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber)); model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber));
model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数 model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数
@ -1045,15 +1045,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
c.SunNumber, c.SunNumber,
c.MonitoringReportNumber c.MonitoringReportNumber
}; };
var AllList = query.ToList(); var AllList = query.ToList();
var monethCount = query var monethCount = query
.Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString(); model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName; model.ContentName = item.UnitName;
model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o=>o.SunNumber)); model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.SunNumber));
model.MonthsCount = Convert.ToInt32(monethCount.Sum(o=>o.MonitoringReportNumber)); model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber));
model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber)); model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber));
model.ReportId = ReportId; model.ReportId = ReportId;
//如果是修改，查询表中数据 //如果是修改，查询表中数据
@ -1141,8 +1141,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
NCRStatisc.WorkName = item.UnitName; NCRStatisc.WorkName = item.UnitName;
//NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
//NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.CheckNum = AllList.Count(); NCRStatisc.CheckNum = AllList.Count();
@ -1283,7 +1285,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new select new
{ {
c.CheckDate, c.CheckDate,
c.ProjectId, c.ProjectId,
c.CheckType c.CheckType
}; };
var AllList = query.ToList(); var AllList = query.ToList();
@ -1570,7 +1572,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 保存方法 #region 保存方法
#region 9.计量器具报验管理情况 #region 9.计量器具报验管理情况
void saveMeasuringInspection() { void saveMeasuringInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>(); List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData(); JArray teamGroupData = gvMeasuringInspection.GetMergedData();
@ -1959,7 +1962,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{ {
ReportId = ReportId, ReportId = ReportId,
ReType = "13", ReType = "13",
TotalNoBackCount= values.Value<int>("TotalNoBackCount"), TotalNoBackCount = values.Value<int>("TotalNoBackCount"),
ContentName = values.Value<string>("ContentName"), ContentName = values.Value<string>("ContentName"),
MonthsCount = values.Value<int>("MonthsCount"), MonthsCount = values.Value<int>("MonthsCount"),
ProjectCount = values.Value<int>("ProjectCount"), ProjectCount = values.Value<int>("ProjectCount"),
@ -2012,7 +2015,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }
#endregion #endregion

6
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -2188,8 +2188,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
NCRStatisc.WorkName = item.UnitName; NCRStatisc.WorkName = item.UnitName;
//NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
//NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
NCRStatisc.CheckNum = AllList.Count(); NCRStatisc.CheckNum = AllList.Count();