diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index 0b620555..3e1ecc6f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -860,6 +860,350 @@ + + + + + + + <%--15.质量巡检情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--16.质量专项检查情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--17.质量文件上报情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--18.本月质量问题处理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--19.下月质量控制重点--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--20.项目质量体系审核--%> diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 38c58b0c..29e05755 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -42,6 +42,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 列表集合 private static List detailsGrid1 = new List(); + + /// + /// 18.本月质量问题处理情况 + /// (1)原材料问题 + /// + private static List rowMaterialProblemLists = new List(); + + /// + /// 18.本月质量问题处理情况 + /// (2)施工过程问题 + /// + private static List constructionProblemsLists = new List(); + + /// + /// 19.下月质量控制重点 + /// + private static List nextQualityControlLists = new List(); #endregion #region 加载页面 @@ -121,6 +138,43 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } #endregion + #region 加载18.本月质量问题处理情况 + //(1)原材料问题 + rowMaterialProblemLists.Clear(); + rowMaterialProblemLists = (from x in Funs.DB.Report_RowMaterialProblem + where x.ReportId == this.ReportId + select x).ToList(); + if (rowMaterialProblemLists.Count > 0) + { + gvRowMaterialProblem.Hidden = false; + gvRowMaterialProblem.DataSource = rowMaterialProblemLists; + gvRowMaterialProblem.DataBind(); + } + //(2)施工过程问题 + constructionProblemsLists.Clear(); + constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems + where x.ReportId == this.ReportId + select x).ToList(); + if (constructionProblemsLists.Count > 0) + { + gvConstructionProblems.Hidden = false; + gvConstructionProblems.DataSource = constructionProblemsLists; + gvConstructionProblems.DataBind(); + } + #endregion + + #region 加载19.下月质量控制重点 + nextQualityControlLists.Clear(); + nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl + where x.ReportId == this.ReportId + select x).ToList(); + if (nextQualityControlLists.Count > 0) + { + gvNextQualityControl.Hidden = false; + gvNextQualityControl.DataSource = nextQualityControlLists; + gvNextQualityControl.DataBind(); + } + #endregion #region 加载文本框内容 var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList(); @@ -190,6 +244,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //8 设备报验管理Grid11 LoadInspectionEquipment(objType); + + //加载15.质量巡检情况 + loadQualityInspection(objType); + //加载16.质量专项检查情况 + loadSpecialCheck(objType); + //加载17.质量文件上报情况 + loadFileReport(objType); } #endregion @@ -1283,6 +1344,386 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } #endregion + #region 15.质量巡检情况 gvQualityInspection方法 + /// + /// 加载质量巡检情况 + /// + void loadQualityInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Check_CheckControl + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.CheckDate, + c.ProjectId, + u.UnitId, + u.UnitName + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "1"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + gvQualityInspection.DataSource = list; + gvQualityInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvQualityInspection.SummaryData = summary; + } + #endregion + + #region 16.质量专项检查情况 gvSpecialCheck方法 + /// + /// 加载质量专项检查情况 + /// + void loadSpecialCheck(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + + //加载检查类别 + var lists = BLL.JointCheckService.GetCheckTypeList(); + foreach (var item in lists) + { + var query = from c in db.Check_JointCheck + where c.ProjectId == this.CurrUser.LoginProjectId && c.CheckType == item.Key.ToString() + select new + { + c.CheckDate, + c.ProjectId, + c.CheckType + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.Value; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.Value && x.ReType == "2"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + + gvSpecialCheck.DataSource = list; + gvSpecialCheck.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvSpecialCheck.SummaryData = summary; + } + #endregion + + #region 17.质量文件上报情况 gvFileReport方法 + /// + /// 加载质量文件上报情况 + /// + void loadFileReport(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + int Quantity3Sum = 0; + int Quantity4Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + //var query = from c in db.Check_CheckControl + // join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + // from u in unitJoin.DefaultIfEmpty() + // where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + // select new + // { + // c.CheckDate, + // c.ProjectId, + // u.UnitId, + // u.UnitName + // }; + //var AllList = query.ToList();//项目数 + //本月数 + //var monethCount = query.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + //var yzCount = 0;//本月业主/ 监理返回数量 + //var NoBackCount = 0;//累计未返回数量 + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + //model.MonthsCount = monethCount.Count(); + //model.ProjectCount = AllList.Count(); + //model.MonthsBackCount =; + //model.TotalNoBackCount =; + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "3"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + //Quantity1Sum += monethCount.Count(); + //Quantity2Sum += AllList.Count(); + //Quantity3Sum += yzCount.Count(); + //Quantity4Sum += NoBackCount.Count(); + i++; + } + gvFileReport.DataSource = list; + gvFileReport.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + summary.Add("MonthsBackCount", Quantity3Sum.ToString()); + summary.Add("TotalNoBackCount", Quantity4Sum.ToString()); + + gvFileReport.SummaryData = summary; + } + #endregion + + #region 18.本月质量问题处理情况 + #region gvRowMaterialProblem 事件 + /// + /// 增加原材料问题 + /// + /// + /// + protected void btnRowMaterialProblem_Click(object sender, EventArgs e) + { + gvRowMaterialProblem.Hidden = false; + + JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + values.Add("Id", teamGroupRow.Value("id")); + list.Add(values); + } + JObject defaultObj = new JObject + { { "RowMaterialProblemId",Guid.NewGuid().ToString() }, + { "ReportId", ReportId }, + { "UnitId", "" }, + { "ProblemDesrioption",""}, + { "TreatmentMeasures", "" }, + { "ProcessingResults","" }, + { "Remark", "" }, + { "delRowMaterialProblem", String.Format("", GetDeleteRowMaterialProblem(), IconHelper.GetResolvedIconUrl(Icon.Delete)) } + }; + list.Add(defaultObj); + gvRowMaterialProblem.DataSource = list; + gvRowMaterialProblem.DataBind(); + } + + /// + /// 绑定数据前事件 + /// + /// + /// + protected void gvRowMaterialProblem_PreDataBound(object sender, EventArgs e) + { + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = gvRowMaterialProblem.FindColumn("delRowMaterialProblem") as LinkButtonField; + deleteField.OnClientClick = GetDeleteRowMaterialProblem(); + } + /// + /// 删除提示 + /// + /// + private string GetDeleteRowMaterialProblem() + { + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvRowMaterialProblem.GetDeleteSelectedRowsReference(), String.Empty); + } + #endregion + + #region gvConstructionProblems 事件 + /// + /// 增加施工过程问题 + /// + /// + /// + protected void btnAddConstructionProblems_Click(object sender, EventArgs e) + { + gvConstructionProblems.Hidden = false; + + JArray teamGroupData = gvConstructionProblems.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + values.Add("Id", teamGroupRow.Value("id")); + list.Add(values); + } + JObject defaultObj = new JObject + { { "ConstructionProblemsId",Guid.NewGuid() }, + { "ReportId", ReportId }, + { "UnitId", "" }, + { "ProblemDesrioption",""}, + { "TreatmentMeasures", "" }, + { "ProcessingResults","" }, + { "Remark", "" }, + { "delConstructionProblems", String.Format("", GetDeleteConstructionProblems(), IconHelper.GetResolvedIconUrl(Icon.Delete)) } + }; + list.Add(defaultObj); + gvConstructionProblems.DataSource = list; + gvConstructionProblems.DataBind(); + } + + /// + /// 绑定数据前事件 + /// + /// + /// + protected void gvConstructionProblems_PreDataBound(object sender, EventArgs e) + { + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = gvConstructionProblems.FindColumn("delConstructionProblems") as LinkButtonField; + deleteField.OnClientClick = GetDeleteConstructionProblems(); + } + + /// + /// 删除提示 + /// + /// + private string GetDeleteConstructionProblems() + { + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvConstructionProblems.GetDeleteSelectedRowsReference(), String.Empty); + } + #endregion + #endregion + + #region 19.下月质量控制重点 + /// + /// gvNextQualityControl加载前事件 + /// + /// + /// + protected void gvNextQualityControl_PreDataBound(object sender, EventArgs e) + { + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = gvNextQualityControl.FindColumn("delNextQualityControl") as LinkButtonField; + deleteField.OnClientClick = GetDeleteNextQualityControl(); + } + + /// + /// 增加 + /// + /// + /// + protected void btnAddNextControl_Click(object sender, EventArgs e) + { + gvNextQualityControl.Hidden = false; + + JArray teamGroupData = gvNextQualityControl.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + values.Add("Id", teamGroupRow.Value("id")); + list.Add(values); + } + JObject defaultObj = new JObject + { { "NextQualityControlId",Guid.NewGuid().ToString() }, + { "ReportId", ReportId }, + { "NextQualityControlContent", "" }, + { "delNextQualityControl", String.Format("", GetDeleteNextQualityControl(), IconHelper.GetResolvedIconUrl(Icon.Delete)) } + }; + list.Add(defaultObj); + gvNextQualityControl.DataSource = list; + gvNextQualityControl.DataBind(); + } + + /// + /// 删除提示 + /// + /// + private string GetDeleteNextQualityControl() + { + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvNextQualityControl.GetDeleteSelectedRowsReference(), String.Empty); + } + #endregion + #region 保存 /// /// 保存按钮 @@ -1326,6 +1767,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //删除施工方案及检验试验计划审批情况 BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); + + // 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况 + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); + //18.本月质量问题处理情况(1)原材料问题 + BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); + //18.本月质量问题处理情况(2)施工过程问题 + BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); + //19.下月质量控制重点 + BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); + #endregion #region 保存所有子表 @@ -1353,6 +1804,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //保存8 设备材料报验管理情况 saveSbclBy(); + //保存15.质量巡检情况 + saveQualityInspection(); + //保存16.质量专项检查情况 + saveSpecialCheck(); + //保存17.质量文件上报情况 + saveFileReport(); + //保存18.(1)原材料问题 + saveRowMaterialProblem(); + //保存18.(2)施工过程问题 + saveConstructionProblems(); + //保存19.下月质量控制重点 + saveNextQualityControl(); + //保存文本框 saveTxtContent(); #endregion @@ -1705,8 +2169,217 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Funs.DB.SubmitChanges(); } + #region 15.质量巡检情况 + /// + /// 15.质量巡检情况 + /// + void saveQualityInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvQualityInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "1", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } #endregion + #region 16.质量专项检查情况 + /// + /// 16.质量专项检查情况 + /// + void saveSpecialCheck() + { + List detailLists = new List(); + JArray teamGroupData = gvSpecialCheck.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "2", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + Remarks = values.Value("Remarks") + }; + if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + + #region 17.质量文件上报情况 + /// + /// 17.质量文件上报情况 + /// + void saveFileReport() + { + List detailLists = new List(); + JArray teamGroupData = gvFileReport.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "3", + ContentName = values.Value("ContentName"), + //MonthsCount = Funs.GetNewInt(values.Value("MonthsCount").ToString()), + //ProjectCount = Funs.GetNewInt(values.Value("ProjectCount").ToString()), + //MonthsBackCount = Funs.GetNewInt(values.Value("MonthsBackCount").ToString()), + //TotalNoBackCount = Funs.GetNewInt(values.Value("TotalNoBackCount").ToString()) + }; + if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + + #region 18.本月质量问题处理情况 + /// + /// (1)原材料问题 + /// + void saveRowMaterialProblem() + { + List detailLists = new List(); + JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem + { + ReportId = ReportId, + UnitId = values.Value("UnitId"), + ProblemDesrioption = values.Value("ProblemDesrioption"), + TreatmentMeasures = values.Value("TreatmentMeasures"), + ProcessingResults = values.Value("ProcessingResults"), + Remark = values.Value("Remark") + }; + if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_RowMaterialProblem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + /// + /// (2)施工过程问题 + /// + void saveConstructionProblems() + { + List detailLists = new List(); + JArray teamGroupData = gvConstructionProblems.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems + { + ReportId = ReportId, + UnitId = values.Value("UnitId"), + ProblemDesrioption = values.Value("ProblemDesrioption"), + TreatmentMeasures = values.Value("TreatmentMeasures"), + ProcessingResults = values.Value("ProcessingResults"), + Remark = values.Value("Remark") + }; + if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_ConstructionProblems.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + #endregion + + #region 19.下月质量控制重点 + /// + /// 下月质量控制重点 + /// + void saveNextQualityControl() + { + List detailLists = new List(); + JArray teamGroupData = gvNextQualityControl.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl + { + ReportId = ReportId, + NextQualityControlContent = values.Value("NextQualityControlContent") + }; + if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_NextQualityControl.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + + #endregion + + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs index b621669f..2163e253 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs @@ -788,6 +788,357 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected global::FineUIPro.TextArea txtAre8; + /// + /// Panel21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel21; + + /// + /// Form20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form20; + + /// + /// gvQualityInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvQualityInspection; + + /// + /// TextBox9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox9; + + /// + /// TextBox11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox11; + + /// + /// Panel22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel22; + + /// + /// Form21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form21; + + /// + /// gvSpecialCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvSpecialCheck; + + /// + /// TextBox12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox12; + + /// + /// Panel23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel23; + + /// + /// Form22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form22; + + /// + /// gvFileReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvFileReport; + + /// + /// Panel24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel24; + + /// + /// Panel25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel25; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// btnRowMaterialProblem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRowMaterialProblem; + + /// + /// Form23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form23; + + /// + /// gvRowMaterialProblem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvRowMaterialProblem; + + /// + /// txtUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnitId; + + /// + /// txtProblemDesrioption 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProblemDesrioption; + + /// + /// txtTreatmentMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTreatmentMeasures; + + /// + /// txtProcessingResults 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProcessingResults; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// Panel26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel26; + + /// + /// Toolbar6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar6; + + /// + /// btnAddConstructionProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAddConstructionProblems; + + /// + /// Form24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form24; + + /// + /// gvConstructionProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvConstructionProblems; + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// txtProblemDesrioption2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProblemDesrioption2; + + /// + /// txtTreatmentMeasures2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTreatmentMeasures2; + + /// + /// txtProcessingResults2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProcessingResults2; + + /// + /// txtRemark2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark2; + + /// + /// Panel27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel27; + + /// + /// Toolbar7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar7; + + /// + /// btnAddNextControl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAddNextControl; + + /// + /// Form25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form25; + + /// + /// gvNextQualityControl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvNextQualityControl; + + /// + /// TextBox13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox13; + /// /// Panel3 控件。 /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 667a04c6..6605fbff 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,13 +12,7 @@ -<<<<<<< HEAD - - - -======= - ->>>>>>> 26d564fea551967fa9d0b160daa17b795a97ae34 + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index dab94685..4248a8c4 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1970,9 +1970,6 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); - partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); - partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); - partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -7810,14 +7807,6 @@ namespace Model } } - public System.Data.Linq.Table Report_CQMS_ProblemHandle - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Report_CqmsTarget { get @@ -98333,10 +98322,10 @@ namespace Model private string _ProjectId; - private string _DraCode; - private string _CNProfessionalId; + private string _DraCode; + private System.Nullable _ReviewDate; private string _UnitWorkId; @@ -98359,10 +98348,10 @@ namespace Model partial void OnIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnDraCodeChanging(string value); - partial void OnDraCodeChanged(); partial void OnCNProfessionalIdChanging(string value); partial void OnCNProfessionalIdChanged(); + partial void OnDraCodeChanging(string value); + partial void OnDraCodeChanged(); partial void OnReviewDateChanging(System.Nullable value); partial void OnReviewDateChanged(); partial void OnUnitWorkIdChanging(string value); @@ -98404,7 +98393,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] public string ProjectId { get @@ -98424,26 +98413,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] - public string DraCode - { - get - { - return this._DraCode; - } - set - { - if ((this._DraCode != value)) - { - this.OnDraCodeChanging(value); - this.SendPropertyChanging(); - this._DraCode = value; - this.SendPropertyChanged("DraCode"); - this.OnDraCodeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")] public string CNProfessionalId { @@ -98464,6 +98433,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")] + public string DraCode + { + get + { + return this._DraCode; + } + set + { + if ((this._DraCode != value)) + { + this.OnDraCodeChanging(value); + this.SendPropertyChanging(); + this._DraCode = value; + this.SendPropertyChanged("DraCode"); + this.OnDraCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")] public System.Nullable ReviewDate { @@ -306714,164 +306703,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] - public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _ReportId; - - private string _ReType; - - private string _UnitName; - - private string _ProblemDes; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnReportIdChanging(string value); - partial void OnReportIdChanged(); - partial void OnReTypeChanging(string value); - partial void OnReTypeChanged(); - partial void OnUnitNameChanging(string value); - partial void OnUnitNameChanged(); - partial void OnProblemDesChanging(string value); - partial void OnProblemDesChanged(); - #endregion - - public Report_CQMS_ProblemHandle() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")] - public string ReportId - { - get - { - return this._ReportId; - } - set - { - if ((this._ReportId != value)) - { - this.OnReportIdChanging(value); - this.SendPropertyChanging(); - this._ReportId = value; - this.SendPropertyChanged("ReportId"); - this.OnReportIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] - public string ReType - { - get - { - return this._ReType; - } - set - { - if ((this._ReType != value)) - { - this.OnReTypeChanging(value); - this.SendPropertyChanging(); - this._ReType = value; - this.SendPropertyChanged("ReType"); - this.OnReTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] - public string UnitName - { - get - { - return this._UnitName; - } - set - { - if ((this._UnitName != value)) - { - this.OnUnitNameChanging(value); - this.SendPropertyChanging(); - this._UnitName = value; - this.SendPropertyChanged("UnitName"); - this.OnUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] - public string ProblemDes - { - get - { - return this._ProblemDes; - } - set - { - if ((this._ProblemDes != value)) - { - this.OnProblemDesChanging(value); - this.SendPropertyChanging(); - this._ProblemDes = value; - this.SendPropertyChanged("ProblemDes"); - this.OnProblemDesChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged {