diff --git a/DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql new file mode 100644 index 00000000..c522e077 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql @@ -0,0 +1,10 @@ + + + + +--NCRֶԭ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Comprehensive_NCRManagement' AND COLUMN_NAME = 'ReasonAnalysis') +BEGIN + ALTER TABLE Comprehensive_NCRManagement ADD ReasonAnalysis nvarchar(1000); +END +GO diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index 4bbfc43f..ab6f1e80 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -60,6 +60,7 @@ namespace BLL ProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalId select y.ProfessionalName).FirstOrDefault(), x.NCRCode, x.Contents, + x.ReasonAnalysis, x.IssuedDate, ReceiveUnit = x.ReceiveUnit!= null ? BLL.UnitService.getUnitNamesUnitIds(x.ReceiveUnit) : null, UnitWorkName = x.UnitWorkId != null ? BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkId) : null, @@ -106,6 +107,7 @@ namespace BLL newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId; newNCRManagement.NCRCode = nCRManagement.NCRCode; newNCRManagement.Contents = nCRManagement.Contents; + newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis; newNCRManagement.IssuedDate = nCRManagement.IssuedDate; newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit; newNCRManagement.ClosedDate = nCRManagement.ClosedDate; @@ -139,6 +141,7 @@ namespace BLL newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId; newNCRManagement.NCRCode = nCRManagement.NCRCode; newNCRManagement.Contents = nCRManagement.Contents; + newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis; newNCRManagement.IssuedDate = nCRManagement.IssuedDate; newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit; newNCRManagement.ClosedDate = nCRManagement.ClosedDate; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx index 9cc30045..326dfbe2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx @@ -67,6 +67,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index b933ca8c..ffe8538a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -29,14 +29,14 @@ namespace FineUIPro.Web.Comprehensive } public void BindGrid() { - string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status, + string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.ReasonAnalysis,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status, C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor, C.CompileMan, C.UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode,su.UserName as SupervisorName from Comprehensive_NCRManagement C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit u on u.UnitId = C.SendUnit left join Sys_User su on su.UserId = C.Supervisor - where C.ProjectId = @ProjectId"; + where C.ProjectId = @ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); if (sdrpUnitId.SelectedValue != BLL.Const._Null) @@ -469,13 +469,17 @@ namespace FineUIPro.Web.Comprehensive cell = row.CreateCell(6); cell.CellStyle = cellStyle; - cell.SetCellValue(item.Measure);//改进措施 + cell.SetCellValue(item.ReasonAnalysis);//问题原因分析 cell = row.CreateCell(7); cell.CellStyle = cellStyle; + cell.SetCellValue(item.Measure);//改进措施 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期 - cell = row.CreateCell(8); + cell = row.CreateCell(9); cell.CellStyle = cellStyle; string receiveUnitName = string.Empty; if (!string.IsNullOrEmpty(item.ReceiveUnit)) @@ -484,7 +488,7 @@ namespace FineUIPro.Web.Comprehensive } cell.SetCellValue(receiveUnitName);//接收单位 - cell = row.CreateCell(9); + cell = row.CreateCell(10); cell.CellStyle = cellStyle; string state = string.Empty; if (!string.IsNullOrEmpty(item.ImplementationFrontState)) @@ -493,19 +497,19 @@ namespace FineUIPro.Web.Comprehensive } cell.SetCellValue(state);//实施状态 - cell = row.CreateCell(10); + cell = row.CreateCell(11); cell.CellStyle = cellStyle; cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期 - cell = row.CreateCell(11); + cell = row.CreateCell(12); cell.CellStyle = cellStyle; cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期 - cell = row.CreateCell(12); + cell = row.CreateCell(13); cell.CellStyle = cellStyle; cell.SetCellValue(item.ResponsibleMan);//责任人 - cell = row.CreateCell(13); + cell = row.CreateCell(14); cell.CellStyle = cellStyle; string supervisorName = string.Empty; if (!string.IsNullOrEmpty(item.Supervisor)) @@ -514,7 +518,7 @@ namespace FineUIPro.Web.Comprehensive } cell.SetCellValue(supervisorName);//监督人 - cell = row.CreateCell(14); + cell = row.CreateCell(15); cell.CellStyle = cellStyle; cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx index b900485a..f1144861 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx @@ -97,31 +97,34 @@ - - - - - + + - - - - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs index 49aa293f..e9ee7ae9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs @@ -248,6 +248,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString(); newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString(); newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString(); + newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString(); BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp); } @@ -432,29 +433,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.Problem = tempData.Value6.Trim(); } } - if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施 + if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//问题原因分析 { - Ins.Measure = tempData.Value7.Trim(); + Ins.ReasonAnalysis = tempData.Value7.Trim(); } - if (!string.IsNullOrEmpty(tempData.Value8.Trim())) + if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//改进措施 + { + Ins.Measure = tempData.Value8.Trim(); + } + if (!string.IsNullOrEmpty(tempData.Value9.Trim())) { try { - Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim()); + Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value9.Trim()); if (Ins.IssuedDate == null) { - errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；"; + errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；"; } } catch (Exception) { - errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；"; + errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；"; } } - if (!string.IsNullOrEmpty(tempData.Value9.Trim())) + if (!string.IsNullOrEmpty(tempData.Value10.Trim())) { string unitIds = string.Empty; - string[] reunit = tempData.Value9.Split(','); + string[] reunit = tempData.Value10.Split(','); foreach (string unitName in reunit) { var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault(); @@ -473,54 +478,54 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Ins.ReceiveUnit = unitIds; } - if (!string.IsNullOrEmpty(tempData.Value10.Trim())) + if (!string.IsNullOrEmpty(tempData.Value11.Trim())) { - if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合") + if (tempData.Value11.Trim() != "整改中" && tempData.Value11.Trim() != "已闭合") { - errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误；"; + errInfo += "实时状态[" + tempData.Value11.Trim() + "]错误；"; } else { - Ins.ImplementationFrontState = tempData.Value10.Trim(); - } - } - if (!string.IsNullOrEmpty(tempData.Value11)) - { - try - { - Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value11); - if (Ins.ClosedDate == null) - { - errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；"; - } - } - catch (Exception) - { - errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；"; + Ins.ImplementationFrontState = tempData.Value11.Trim(); } } if (!string.IsNullOrEmpty(tempData.Value12)) { try { - Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12); - if (Ins.CompleteDate == null) + Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value12); + if (Ins.ClosedDate == null) { - errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；"; + errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；"; } } catch (Exception) { - errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；"; + errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；"; } } - if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人 + if (!string.IsNullOrEmpty(tempData.Value13)) { - Ins.ResponsibleMan = tempData.Value13.Trim(); + try + { + Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value13); + if (Ins.CompleteDate == null) + { + errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；"; + } + } + catch (Exception) + { + errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；"; + } } - if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人 + if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//责任人 { - string[] strs = tempData.Value14.Trim().Split(','); + Ins.ResponsibleMan = tempData.Value14.Trim(); + } + if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//监督人 + { + string[] strs = tempData.Value15.Trim().Split(','); bool b = true; string supervisor = string.Empty; foreach (var item in strs) @@ -544,15 +549,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } } - if (!string.IsNullOrEmpty(tempData.Value15)) + if (!string.IsNullOrEmpty(tempData.Value16)) { try { - Ins.RemarkCode = Convert.ToInt32(tempData.Value15); + Ins.RemarkCode = Convert.ToInt32(tempData.Value16); } catch (Exception) { - errInfo += "标志编号[" + tempData.Value15 + "]格式错误；"; + errInfo += "标志编号[" + tempData.Value16 + "]格式错误；"; } } else @@ -564,7 +569,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.ProjectId = LoginProjectId; Ins.Status = BLL.Const.Comprehensive_Compile; Ins.CompileMan = this.CurrUser.UserId; - var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15)); + var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value16)); if (isExitISOValue != null) ///已存在 { Ins.NCRManagementId = isExitISOValue.NCRManagementId; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx index afc9e884..bbf16171 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx @@ -33,7 +33,6 @@ - @@ -42,32 +41,38 @@ - + - + - + - + - + - + - + - + - + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs index cbf4af35..23609f9c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs @@ -57,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtValue13.Text = dataInTemp.Value13; this.txtValue14.Text = dataInTemp.Value14; this.txtValue15.Text = dataInTemp.Value15; + this.txtValue16.Text = dataInTemp.Value16; this.lbErrCout.Text = dataInTemp.ToopValue; } @@ -244,6 +245,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } } + if (dataInTemp.Value16 != this.txtValue16.Text.Trim()) + { + var tempValue16 = allDataInTemp.Where(x => x.Value16 == dataInTemp.Value16 || (x.Value16 == null && dataInTemp.Value16 == null)); + if (tempValue16 != null) + { + foreach (var item in tempValue16) + { + item.Value16 = this.txtValue16.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue); if (toopValue != null) { @@ -276,6 +289,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newDataInTemp.Value13 = this.txtValue13.Text.Trim(); newDataInTemp.Value14 = this.txtValue14.Text.Trim(); newDataInTemp.Value15 = this.txtValue15.Text.Trim(); + newDataInTemp.Value16 = this.txtValue16.Text.Trim(); if (!string.IsNullOrEmpty(this.TempId)) { newDataInTemp.TempId = this.TempId; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs index d81bdf52..2ad9148c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class NCRManagementDataInNewEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class NCRManagementDataInNewEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// txtValue1 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue1; - + /// /// txtValue2 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue2; - + /// /// txtValue3 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue3; - + /// /// txtValue4 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue4; - + /// /// txtValue5 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue5; - + /// /// txtValue6 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue6; - + /// /// txtValue7 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue7; - + /// /// txtValue8 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue8; - + /// /// txtValue9 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue9; - + /// /// txtValue10 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue10; - + /// /// txtValue11 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue11; - + /// /// txtValue12 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue12; - + /// /// txtValue13 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue13; - + /// /// txtValue14 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue14; - + /// /// txtValue15 控件。 /// @@ -200,7 +202,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue15; - + + /// + /// txtValue16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue16; + /// /// ckAll 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckAll; - + /// /// lbErrCout 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index c508e8bd..9599b352 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -29,15 +29,15 @@ - + - - - - - - - + + + + + + + @@ -45,7 +45,12 @@ - + + + + + + @@ -62,12 +67,12 @@ - - + + - - + + @@ -91,10 +96,10 @@ - + - <%-- + <%-- @@ -120,17 +125,16 @@ --%> - - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 84fdad89..116d9730 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -40,9 +40,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpSupervisor, this.CurrUser.LoginProjectId, BLL.Const.UnitId_CWCEC, false);//监督人 - //LoadAuditSelect(); - //this.agree.Hidden = true; - //this.options.Hidden = true; this.NCRManagementId = Request.Params["NCRManagementId"]; Model.Comprehensive_NCRManagement nCRManagement = BLL.NCRManagementService.GetNCRManagementById(this.NCRManagementId); @@ -60,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } this.txtNCRCode.Text = nCRManagement.NCRCode; this.txtContents.Text = nCRManagement.Contents; + this.txtReasonAnalysis.Text = nCRManagement.ReasonAnalysis; if (nCRManagement.IssuedDate != null) { this.txtIssuedDate.Text = string.Format("{0:yyyy-MM-dd}", nCRManagement.IssuedDate); @@ -164,6 +162,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtCompleteDate.Readonly = true; this.drpCNProfessionalId.Readonly = true; this.txtContents.Readonly = true; + this.txtReasonAnalysis.Readonly = true; this.ddlImplementationFrontState.Readonly = true; this.txtIssuedDate.Readonly = true; this.txtNCRCode.Readonly = true; @@ -215,6 +214,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择发出单位！", MessageBoxIcon.Warning); return; } + if (string.IsNullOrWhiteSpace(this.txtReasonAnalysis.Text.Trim())) + { + Alert.ShowInTop("请填写问题原因分析！", MessageBoxIcon.Warning); + return; + } if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); @@ -243,7 +247,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive } nCRManagement.NCRCode = this.txtNCRCode.Text.Trim(); nCRManagement.Contents = this.txtContents.Text.Trim(); - + nCRManagement.ReasonAnalysis = this.txtReasonAnalysis.Text.Trim(); + #region 新增2024-03-29 string problem = string.Empty; foreach (var item in this.ddlProblem.SelectedValueArray) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs index d664072b..a020e400 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class NCRManagementEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class NCRManagementEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpSendUnit 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSendUnit; - + /// /// drpCNProfessionalId 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtNCRCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtNCRCode; - + /// /// txtIssuedDate 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtIssuedDate; - + /// /// ddlProblem 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlProblem; - + /// /// txtRemarkCode 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtRemarkCode; - + /// /// txtContents 控件。 /// @@ -101,7 +103,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtContents; - + + /// + /// txtReasonAnalysis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtReasonAnalysis; + /// /// txtMeasure 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtMeasure; - + /// /// drpUnitWorkIds 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// drpUnitIds 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitIds; - + /// /// drpSupervisor 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSupervisor; - + /// /// ddlImplementationFrontState 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlImplementationFrontState; - + /// /// txtResponsibleMan 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtResponsibleMan; - + /// /// txtClosedDate 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtClosedDate; - + /// /// txtCompleteDate 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCompleteDate; - + /// /// Panel2 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// Toolbar1 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs index 9e0fbdb7..064cf122 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs @@ -179,7 +179,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl if (string.IsNullOrEmpty(code)) { - errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" }); + errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" }); + } + else + { + var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code); + if (q != null) + { + errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = $"试压包编号（{code}）已存在！" }); + } } if (!string.IsNullOrEmpty(unitWorkName)) { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs index 6239f441..a61d363e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs @@ -4,7 +4,7 @@ using System.Linq; namespace FineUIPro.Web.CQMS.ProcessControl { - public partial class TestPackageManagementEdit :PageBase + public partial class TestPackageManagementEdit : PageBase { #region 定义变量 /// @@ -72,14 +72,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// protected void btnSave_Click(object sender, EventArgs e) { - if (this.drpUnitWork.SelectedValue==BLL.Const._Null) + if (this.drpUnitWork.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择单位工程名称！", MessageBoxIcon.Warning); return; } + string code = this.txtTestPackageManagementCode.Text.Trim(); + if (string.IsNullOrWhiteSpace(code)) + { + Alert.ShowInTop("请填写试压包编号！", MessageBoxIcon.Warning); + return; + } + else + { + var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code); + if (q != null) + { + Alert.ShowInTop("试压包编号已存在！", MessageBoxIcon.Warning); + return; + } + } Model.ProcessControl_TestPackageManagement testPackageManagement = new Model.ProcessControl_TestPackageManagement(); testPackageManagement.ProjectId = this.CurrUser.LoginProjectId; - testPackageManagement.TestPackageManagementCode = this.txtTestPackageManagementCode.Text.Trim(); + testPackageManagement.TestPackageManagementCode = code; if (this.drpUnitWork.SelectedValue != BLL.Const._Null) { testPackageManagement.UnitWorkId = this.drpUnitWork.SelectedValue; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls index a886bfc1..741cbf6f 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls index d0d5edf3..f786572a 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/Login.aspx b/SGGL/FineUIPro.Web/Login.aspx index b781e94e..133dd338 100644 --- a/SGGL/FineUIPro.Web/Login.aspx +++ b/SGGL/FineUIPro.Web/Login.aspx @@ -14,20 +14,20 @@ src="./images/login.png" style="height: 100%; left: 0px; top: 0px; bottom: 0px; position: absolute; display: none;" />--%>