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

Compare commits

base: lpf:0a594115b3423caa989a142118b294ca4d157368
Branches Tags
lpf:master
lpf:panhf_20240125
..
compare: lpf:4d9b7e2b7999528a7f719b39ecc5163630b0e5cb
Branches Tags
lpf:master
lpf:panhf_20240125

No commits in common. "0a594115b3423caa989a142118b294ca4d157368" and "4d9b7e2b7999528a7f719b39ecc5163630b0e5cb" have entirely different histories.
0a594115b3 ... 4d9b7e2b79

2 changed files with 144 additions and 147 deletions
Show Stats Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
View File

@ -358,7 +358,7 @@ namespace FineUIPro.Web.Comprehensive
{ {
lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim())); lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim()));
} }
lists = lists.OrderBy(x => x.RemarkCode); lists = lists.OrderBy(x => x.IssuedDate);
if (lists != null) if (lists != null)
{ {
string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);

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

@ -1071,22 +1071,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary> /// </summary>
void OutPutSummaryGrid9() void OutPutSummaryGrid9()
{ {
if (Grid9.DataSource != null) DataTable source = ObjectToTable(Grid9.DataSource);
int Quantity1Total = 0, Quantity2Total = 0;
foreach (DataRow row in source.Rows)
{ {
DataTable source = ObjectToTable(Grid9.DataSource); Quantity1Total += Convert.ToInt32(row["Quantity1"]);
int Quantity1Total = 0, Quantity2Total = 0; Quantity2Total += Convert.ToInt32(row["Quantity2"]);
foreach (DataRow row in source.Rows)
{
Quantity1Total += Convert.ToInt32(row["Quantity1"]);
Quantity2Total += Convert.ToInt32(row["Quantity2"]);
}
JObject summary = new JObject();
summary.Add("UnitOrMajor", "合计");
summary.Add("Quantity1", Quantity1Total.ToString());
summary.Add("Quantity2", Quantity2Total.ToString());
Grid9.SummaryData = summary;
} }
JObject summary = new JObject();
summary.Add("UnitOrMajor", "合计");
summary.Add("Quantity1", Quantity1Total.ToString());
summary.Add("Quantity2", Quantity2Total.ToString());
Grid9.SummaryData = summary;
} }
public static DataTable ObjectToTable(object obj) public static DataTable ObjectToTable(object obj)
@ -2820,147 +2817,147 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId); Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
//if (weekAndMonthReport != null) if (weekAndMonthReport != null)
//{ {
// if (weekAndMonthReport.SortId != null) if (weekAndMonthReport.SortId != null)
// { {
// this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId); this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
// } }
// if (weekAndMonthReport.StartDate != null) if (weekAndMonthReport.StartDate != null)
// { {
// this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate); this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
// } }
// if (weekAndMonthReport.EndDate != null) if (weekAndMonthReport.EndDate != null)
// { {
// this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate); this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
// } }
//} }
//AddOrUpdate = "update"; AddOrUpdate = "update";
//#region 加载本月质量目标管理情况 #region 加载本月质量目标管理情况
//detailsGrid1.Clear(); detailsGrid1.Clear();
//detailsGrid1 = (from x in db.Report_CqmsTarget detailsGrid1 = (from x in db.Report_CqmsTarget
// where x.ReportId == this.ReportId where x.ReportId == this.ReportId
// orderby x.SortId orderby x.SortId
// select x).ToList(); select x).ToList();
//if (detailsGrid1.Count > 0) if (detailsGrid1.Count > 0)
//{ {
// Grid1.Hidden = false; Grid1.Hidden = false;
// Grid1.DataSource = detailsGrid1; Grid1.DataSource = detailsGrid1;
// Grid1.DataBind(); Grid1.DataBind();
//} }
//#endregion #endregion
//#region 加载7.2 PQR/WPS报验情况 #region 加载7.2 PQR/WPS报验情况
//var detailsGrid9 = (from x in db.Report_Construction_Plan var detailsGrid9 = (from x in db.Report_Construction_Plan
// where x.ReportId == ReportId && x.ReType == "5" where x.ReportId == ReportId && x.ReType == "5"
// select x).ToList(); select x).ToList();
//if (detailsGrid9.Count > 0) if (detailsGrid9.Count > 0)
//{ {
// Grid9.Hidden = false; Grid9.Hidden = false;
// Grid9.DataSource = detailsGrid9; Grid9.DataSource = detailsGrid9;
// Grid9.DataBind(); Grid9.DataBind();
//} }
//if (!string.IsNullOrEmpty(Request.Params["view"])) if (!string.IsNullOrEmpty(Request.Params["view"]))
//{ {
// //查看页面 //查看页面
// Button4.Hidden = true; Button4.Hidden = true;
// Button3.Hidden = true; Button3.Hidden = true;
// //合计 //合计
// OutPutSummaryGrid9(); OutPutSummaryGrid9();
// Grid1.FindColumn("Delete1").Hidden = true; Grid1.FindColumn("Delete1").Hidden = true;
// Grid9.FindColumn("Delete9").Hidden = true; Grid9.FindColumn("Delete9").Hidden = true;
//} }
//#endregion #endregion
//#region 加载18.本月质量问题处理情况 #region 加载18.本月质量问题处理情况
////(1)原材料问题 //(1)原材料问题
//rowMaterialProblemLists.Clear(); rowMaterialProblemLists.Clear();
//rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem
// where x.ReportId == this.ReportId where x.ReportId == this.ReportId
// select x).ToList(); select x).ToList();
//if (rowMaterialProblemLists.Count > 0) if (rowMaterialProblemLists.Count > 0)
//{ {
// gvRowMaterialProblem.Hidden = false; gvRowMaterialProblem.Hidden = false;
// gvRowMaterialProblem.DataSource = rowMaterialProblemLists; gvRowMaterialProblem.DataSource = rowMaterialProblemLists;
// gvRowMaterialProblem.DataBind(); gvRowMaterialProblem.DataBind();
//} }
////(2)施工过程问题 //(2)施工过程问题
//constructionProblemsLists.Clear(); constructionProblemsLists.Clear();
//constructionProblemsLists = (from x in db.Report_ConstructionProblems constructionProblemsLists = (from x in 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;
// gvConstructionProblems.DataBind(); gvConstructionProblems.DataBind();
//} }
//#endregion #endregion
//#region 加载19.下月质量控制重点 #region 加载19.下月质量控制重点
//nextQualityControlLists.Clear(); nextQualityControlLists.Clear();
//nextQualityControlLists = (from x in db.Report_NextQualityControl nextQualityControlLists = (from x in 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;
// gvNextQualityControl.DataBind(); gvNextQualityControl.DataBind();
//} }
//#endregion #endregion
//#region 加载文本框内容 #region 加载文本框内容
//var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList(); var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
//if (txtReportList.Count > 0) if (txtReportList.Count > 0)
//{ {
// txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText; txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
// txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText; txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
// txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText; txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
// txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText; txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
// txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText; txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
// txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText; txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
// txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText; txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
// { {
// imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl; imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
// txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText; txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
// } }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
// { {
// imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl; imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
// txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText; txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
// } }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
// { {
// imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl; imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
// txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText; txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
// } }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
// { {
// imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl; imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
// txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText; txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
// } }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
// { {
// imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl; imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
// txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText; txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
// } }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null) if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
// { {
// imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl; imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
// txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText; txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
// } }
//} }
//#endregion #endregion
////加载所有grid //加载所有grid
//lodAllGrid("1"); lodAllGrid("1");
} }
#region 保存方法 #region 保存方法