From 46f56a27cbe3a2df8cae948bde9d2514bfc59751 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 22 Oct 2025 16:38:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81logo=E8=B0=83=E6=95=B4=202=E3=80=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86NCR=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SUBQHSE_V2025-10-22-xiaj.sql | 10 +++ .../Comprehensive/NCRManagementService.cs | 3 + .../CQMS/Comprehensive/NCRManagement.aspx | 3 + .../CQMS/Comprehensive/NCRManagement.aspx.cs | 24 ++--- .../Comprehensive/NCRManagementDataInNew.aspx | 21 +++-- .../NCRManagementDataInNew.aspx.cs | 83 ++++++++++-------- .../NCRManagementDataInNewEdit.aspx | 25 +++--- .../NCRManagementDataInNewEdit.aspx.cs | 14 +++ ...CRManagementDataInNewEdit.aspx.designer.cs | 65 ++++++++------ .../CQMS/Comprehensive/NCRManagementEdit.aspx | 40 +++++---- .../Comprehensive/NCRManagementEdit.aspx.cs | 13 ++- .../NCRManagementEdit.aspx.designer.cs | 69 +++++++++------ .../TestPackageManagementDataIn.aspx.cs | 10 ++- .../TestPackageManagementEdit.aspx.cs | 21 ++++- .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 25088 -> 22528 bytes .../Excel/DataIn/管道试压包管理导入模板.xls | Bin 18944 -> 19456 bytes SGGL/FineUIPro.Web/Login.aspx | 8 +- SGGL/FineUIPro.Web/WorkBench.aspx | 2 +- SGGL/FineUIPro.Web/common/mainProject2.aspx | 4 +- .../res/index/images/iconlogo.png | Bin 68687 -> 62122 bytes .../res/index/images/iconlogo1.png | Bin 0 -> 68687 bytes .../res/index/images/logo - 副本.png | Bin 0 -> 16370 bytes SGGL/FineUIPro.Web/res/index/images/logo.png | Bin 16370 -> 10469 bytes .../res/largescreen/css/userPage.css | 6 +- .../res/largescreen/images/logo.png | Bin 9817 -> 62122 bytes .../res/largescreen/images/logo1.png | Bin 0 -> 9817 bytes SGGL/Model/Model.cs | 28 +++++- 27 files changed, 287 insertions(+), 162 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql create mode 100644 SGGL/FineUIPro.Web/res/index/images/iconlogo1.png create mode 100644 SGGL/FineUIPro.Web/res/index/images/logo - 副本.png create mode 100644 SGGL/FineUIPro.Web/res/largescreen/images/logo1.png 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 a886bfc194ef0abdd4644fd21c4e636bc49fc344..741cbf6f35e9e641f4feb1aa498ec72174662b9f 100644 GIT binary patch literal 22528 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 literal 25088 zcmeHv2Urxzws6fb3_}hgk{N;|$r%#}22=zE6DAZLOel(o0a!7xilTy9mt{?ubHapx zsEDE~in3-fXVFzrSDklGHxub$Vc-4V_ul<)%~#!Br%tLag@ch8mIb*ne*H?ARa zsUuM$KZL4;D+Oo4HD)U55W5xcpE0KV*ULpsRCzA9CRA0vY>U1u_q^ zDr7at>X0=cYeLq7tPL4lfapTjgWLkLKIE2=4IsCIYzWy1vN2>6$fl6ZAe%$BfXs(% z3E2v=HDnvets&b&wu5XB*#WX6Cp1dWCR>XG=+f_jy}j|K^fbGI!IMD zdU=aB6Id^jOeGWGH-fT#cj$#!$|eX&BxB)vVk4aFK|adGvD;MnIF8Hfd7|#93hIwM z&^FjLOyeKNo%Hy}vZC>ibvXX<{Gar{*8-|M9m3)g?RD(y*yYrm|Cja>_S_$BmHVJa zfrAv)d-ebH8TAnd9O$T+6rG_;O1~e{15pZ2v4HXqTz?qO;(DaVdPQeBdQwf}|C^mV zQ}!TiSm`OdF(aVJ9NL5PB7mRy-FRmO;=X$d=6jhX>v@v*tp>A$`I5we@P72^0 z1@Jpy8zw%ek3NIkJK)h86r3d^7x8r&@mXN!hI*o0F9mQ_MmQVpH<xKL=ma98F*NHiZ1 z9r={_Xnwo;V!b{RfR(cqRS1mcn{!;?rVeiFqWRKvj(lk%N4^Y20Nnbul@$g`NZ8kt z%D{j@K!8N358OezO9>U>isecGa+Jp4TX0u9#D;F9L%SjN_18lj%sCcdZ@9me)KbQh zLE(eN;r6#41?5QbfFiPK4NUlQII^55#A@mun~;w}(Mk+Mixlw@j?)zd|9~(|jl*$z zV8T}f$5oFB|KAmk7GzO-9C!tZP1{r4UYxEmaV#kNH-tMYfIBLHyC{I0D1f^vfIBIG zn<;>+D}XD~M-hKdiVsFIl%I(0W3B*B>(daQ)~6xdMgbpp1#mA4t^#o(rO#)ox8Okc zBkpW5`7_3j6ugr3hD!+aX?)xPlY&E$hGV2x59h-rY>dgl<;EjMgcQEmKD3|Ut{MfG z!^fRAS$x`ma0aNCI|9}rv7Rb0SyFJh_Nu^)%>>6gcnZEkS9i7gYIVXfpzMZ`EDev1 zEwm`KARJ!`j*%<{m(x>U0UUP(Df~(@94=w9r0t^uGcpBlpr->P9CsBde6iiyQ2O9b zBLxTjX+3HEVI361>2}fM1$QJVd^!Ca`ddeee?z#M0=T~dcys;Mo8qG)(lbX_*FfC> z`o)-nW52WTJ_8$wseWD}u)eVnh#i4R3`cx`ibS1^Ugf}5dL=cPH3=o+^?9Jz=^5mJ|^xp&~=!S}!;9AiHCg_@qnc%|G1SaUN zikaZ#*90c$!it&TlGOwz=+=sv;Cl79Ov*zW?;Tv+n!u#--ob^U2}~OA9b7h>z@+is zf!VYvOd9VUTtJ$jN#nhPv%7=|6lCXNdhB?3Hr_kD`Z12dgl2*W^(Wy|Lz*>d?_E%-PlhttAvyo9#o`B7(U!WWB|JF@m zA`EDpiEUGu$a|uE`|W^<#9$4Y)3E*aVySq)pF_ApnK%UfA1j2VmxYokPF|{mSSsS; z14tPr4W;6feA?G3f)PZPKqU3tTWP8Nsk$c(E|u1zSy8IL^c+tvBb@8DAiLe6>Zl9m+|^L0{QsNTSm0-1_y_|jR1(c?(y)e;Mj+re zYn|!TT!NtH5(JA0(Cry!Px*1uxw!;gnoH1COwh!swOexuLYhm^y}1NEnoH1AOwh!B z2o)1F(Mr9VOAyvvg7D@N^lqGBIok;KF4YLjgSf%_p?u;DIdEFS96sy-F5`8B3=HZM zi(@WSgC~;>F>#t^!SiVqjv)5VlXpU8yv7*;{Jk~qy`dakW;q@Va;zBT&`|{?M_Ca2 z{?2V?IeN@;JQ?KJGRncgqrN>{LF~(S_n76hV3y;>AjgqW4#q3>a#RGdkM6%>mZQ%s z$D2Wp3!@x5%%SYY6U5$n^Cz>MmdtW|802^`%E3sezCEgf*zeD8GRrYQIbIB2)X?87 zKn@e8SPrK=^l14bW;v~x{`@ zh*=JkzqMhMBkgbHq2)!lnB^EV%VF|2S4KI~{#G8EfA1Ny91~_aO#bG{C`a1g%0s_h zKg2A@6y^9d$=~=OhY3^SZyug24_47~aB_nrp5M%vk9CKzl zO#WuiC`a1gJUq`-{lYBAf>{oezd13=k@hza&;9F5ndR`A1X)fAjEMcIghY z97|?7O#bG@C`a1gJUqV^E@hI#Ay#S1!eu;Dm^Q&f>Jv*@S*S#QO5#RTjz`dPwkmv< z0WZj@j9Ig08Ly2jvXZutO|S-IS!ykX0K}quD&=deB0`jhb4$HEe7OL0PK|1)voYwL8YQhWZtsb7hL0RXJXGO@0PwbMaqWgTSY?%r zKyj?WJ88;h(u#AXJcR}KdlJ9lLZ5JmQyK>vWh~n$We%{kTg)1U4M8mDG!?+&%VDX2 zs)#ihCTFlbg{ummNr9#t7OhTR#*3FFU>g8itic;kjAzhNxUnK?G43=`Rzt0^5_k4! zttBO%Or5GsX*pY)xPlQ_MPnY1?iU%{r~Q~^ys2_pv;ujOdTCv7ACIyiG)25Nh;+f7 z9WG@-)P*jIbfHTkUFZ_(;)c3B%(#$kH+;UpY4kE4M&*>Hr~`}b4e})Q(jJ6OulFEL zm`60$`FNa{uN4mMWYFX%rA zz@0zZe>~Haz%$HcSt%=lLcx)}!nqMER$)ughrH6bfN3L#$rY-IF=hS88~uo#+;quS1-ri= zTDa)V%6Ul*r>`{F+!H&WKRTb}rm~%EXK>7*uSK<@4w0-)a3cx*FCI*|u(Xx%!=*}| zpQV_ebU+2KM)mGR8Kwchb`pNLP|5RaE#@a3I1%#8i6~}%?IrwhnUd${Am%3>AQ6%_ zY9lkh4ibLY3-bJ&#r&iLAwqiYI>*efql6y@Kl1$C#r&iL9{4b1RaYi{s__0c43KAW z7qXY}h5l02f8F04|Hh>Zy;GBB_Rvs z=)$irtaULYjtJnBzeM=V60dqe9t9uy;U|Fp@V?<#k^~?8B}!q00&FxH12A_O<-@5@ z71Ck+O~mak!X=So1cF3&gv8-qkO<;|5Ix+x5kWlH@eIj2DZS_wlzwWl2|feaBvprW zna~CO;aAM!L58nQUa(0lFBUS^(us}lJJ#X`4#=s+hc+x7`XfS!K){-Rp96{cJ0OA4 z0|(f7OiN26b?~y-q4+pxReZ*4gEnf?v06fcgE^}m@EjZb_DQ`AS$&{a8_1+ zYCO|_Y{0k3VQtwvQ^NNy6%ucNi!6m=)^|0lbp}`iOyM8GYNFGlYxk}YsIka!_z~f4 z5=?kpt_oL~r=p^ws>)N-(AU&ZSJyDoYoV=gW^7?@W^8K8w{fxKTRB;qn%et1IJvod zd3jmb`FHU1Xz$|b<$+9Cs;a6Q>KcZcnuZ>hrj{PfPQoIh%OiHgQHcegzUZ=)bXmeP z_;M>t8MH-(>l2Hu#8Kv|@Kn{*0pYL?eE*`P#O5d|D|4VrS*cJ@IJ(MumhPRnE&7a5 zv6`&!F*|z$&pK#-am$E`S{u)pggL5e2CWQ@j9c5<**iFTdHeYK`L_-3+@))`knTMq z`}XTUU|`gsk)s5$qsNRLHzjdu(zNL_X3m|L{`33=84H&!U$Ju4>NRWEZQQguZ_Czg z+jkr|cdi><+v*$0~z5nyW$4_;i zzkJ1Zv4|4gEOE=^+NBHaVski392IOAi#-jpk}gNt(w(cS<@Oe=O499+%QSIZV?S7_y$T>Nf)NGXFoZ7>-KIy z+Q-||ckNERnRxqXey~l2|L}_?+bxS8@;^Mg?t1#SMXhqZug7~8#F~V-ta5kGzj=K{ z+a-o(t|+1yH1ZEa;5X}{(F3nK$4})JWOUi_$99h&wW;skAGy29E^7uEaM^u&(wQMe z$LIh2Eqv>sGLJ5;@7_HhvO%MGny1N6VltCiOHyCl zB{Nh?|2pRDJX{drYbw7U+uWhzUQ>#$D6qPk~n94M0Y+Z(k_$XWByQ+d9?9{un5`)!tX)IHOv0B0Xzh*;&%L2J zv+VljB@ul)Kb@~avNHWua$cLyC+4had&l|S>iBD3_@qI`DMW1 z^`8yzr#QcBwQ#TRT<)3uWqh+er$#1cnr*t@ab>=cXuNyy_KT2I%zFE+@Y}@Wdo$Xm z=Ps@>^Q~DrKk!85#P-`pE$O&JiTkC%=(dXayyck-$%m!$+h!i$TT-C*CSg$j!+m4z zS}*)|EMVxdJsS_4^xm|0{x{Dp&((@gl}*g{)XFSMDShYfy)#gG#()JsG)irEeXW}3 zJvPy-OGZq#o>fe$Pxbl^rPj9=+Ot>WYJEPNY9qsI?)fDo0{BFs2Uvv2JTHMpM^1H*tcg7k~5ixdH2 z^tTI}osr(>*x*)#7+ zeP!g=KB^Feu++mUA|DGZM(Yw*-bfz->VUMyQI27hK2uHkPQ;84w+PXyLM_6|9b6zd zlE4~{NQnY}fpeHE#Hg=V^7>-5%9@=K6sJa}^m)A!nF9aJ!8$Q`37gi|i~kBc9;S(# zDpk=2v+5#|2ewQV zoOV2nCZw-LWO%ou3h@x!*h-NF&}45`u33|u(k6l@EM2NT6A3lL+#-5~I}!WEzh}3d zHEk7rwIP|Ch`3HfGfZ{lsYM$WVY>?ikB8C_^_feD(IuUj;=XsoH^7wJ|9BZxH8n)3YwO-NS?e3zfqqYjU>s*!w=Hjm=Aw zZbS3#`-b1#-9KZtv0?iWdD?3}96xo^-gkal_l$KBdC5;EjSfA~VM$hkMb_r4U;Wq@ zy_0OyzNcwjn%d`%;meF{zlUYPRgaa9>@yqK;mzYOYiu559XcN16Sk{IFmLX`qGgq@ zwteYZW)S3Z;h5b=m(6W5He8B2-S>;pzGuS(-WA^4?(yHNXX=&g)5wVaeKg<5`AK2B z+>BSZZ$!nNyu0MUk`$j||LJE7)~YDygxbHO9*1w#m!e;iX)) z6TEqw-_~vK@MF)SFEuNk@(tGQ;FdfH4!Ag`CaFW=tT|=ro42;+4W2&f=S|7C4@aNu zU9qYCC3lm&kRxs@^|Tk<3_lsMCumefnaZ+9&~xx z##W8($E^IqiLbaj;I)ub@Mf(6lk)DU_N%DycvElvLhE;CyN+$W*(>Q3+5cp!s_Vl%LK=YmzG zYzx-idCq$)$Bn&v_kB@Wuie-G>bPAc$dMyUt|y&fBe1m4=Vgt$O+Kc)`r>zmrLZb1wH^<#?&Py?(uPryftX#__M_(S!aD))h@o=KmWv& zYR&Txstjts@7#U(=S9Bj*HnBM&f0Bu>+RFZp6BNsG;>WctA2Udv}3nUUMnVVi3*** zBWK&o2cvB4hrNjDT4Q--Jtv@gqjt#m)B83$L>$Zvoy4>J)%8kFEw^~3Q9Jz$>6VxD z%X(i4Jv_J0Q{%b&*1E4}^Y=!#4~E>~rw`vgS7?_mwXg{Idhcq2!JBHY9WE&!KiU<} z`eOO@_00i$b5ov_UUdBN^litl&r8F<2ZrPw>+BjZ>+8iox4IU7{#+HGJH2`^d+Cl^ z%U%mQ=a=c;daC*?R^wrhu&xhc+WhRk<+7To(gf}2xeLvzUmL}C95Vmtxf6El7k*Cj z-J)$8rLupG&|D`t_Dr?HOe)REA%+AtTGh?2G-jg-&xVerwpF^}JpWeYOOz-!qMS@$4 z5iP5htF<@NJ=Z5bbn}PZ$E*YIFT55Xl>Y8S>gr2+tsL|_)K;8K_up%k|D}`fx$aL& zw8j_@*#EXniPtCd)6w_E(~kXO`PJ-O+O^2LsY~@r?~ZOY=Y&@R`~}8>+_h>;UE_7$ zoOwI^ob8%5j!K8`Zm(4BCEOKv`|FP*aZmsH!{F7-Q;%-?_t_O*@?E{>2cO(6$(#c* zlNZe#yy1TTXVn4G8^SL>zPR_|pAj1U2KmlC^4!OH`h%qEPnpvn-0|IzsactsJ@{&3 zjoy)slP$R3%2NzlKfdX-sHV?TuYC!VvWsFh^@gMd_G`ajGS@8SuGg3B^6uUA1Vc{i zUe!n*JATU~wcek|t;%jK1_#^pKamnQf568{li3bshTE;CR685)9>;zvI5N}QPVM;j zma$WvD~}z!zIe=*_HFOV9JY#` zJ1()KL;osE!yoPrMN9UKFB=sU)Ng8%p!4m^r=H}k2ydx7cY4aau5pf^+>b`jcYNl# zMej|=&@NY8Cym^?d%~7G4|42=e#|Yee&rV%mHB7F&d5XON2&X67<6IyJ;w*LCl0&0 zIHA>mvzx!Q-X5X(P`K7{X29%=3$E|~6v$hBj&1#`!|OElmQ%I`MTM4}N;5cJskOl1 z=*RT2JjbKQeT2&XmBI;^ql|5L*Mx5WGsSIawX-d)j`z%CY3O9KQDe`FtRG5$S+uk~7#;lK=eCdj>OELD^l zkdvV!pBf~^O(+fX_MZM})WXwOHv3&QEM22L=DO?9ln=zTK(m!=u&%9sfdan##u@niW~U9f4KN1Qu>Pxz&x1N2q05YJskgPkO1HcGI6%H)k3z zKK|Nqoow5?3$E<0RGRn5Thk}Nrq8R_ntPmhF7rp6T08c{>R-!RjP$tYK4yn8ukG`d zlh+kbIQnWyV1z+f#?5x4_6?u2B;NOR%hB0A?R(kUMA*ByuSw9d>#;oN%EG>1()Rdm zTH61S)ut_-&Y!pvQa3eq{kvaSDQ9g8Vsw(P6QfnV*9i}P_cP8I?P_5#^hcjgQ*Nd! z+iyHqUTyu$j!@2p!N-rExepDaqY@U|8D6kf6tDuCRALBUd-s%OARoa=sNKMxQt_NT zp?pLnAvA(eQ7ST`qa-Qw%X5+sPb8dfFma-S6?q==P9WiN2wotS)}|4c=-pEpU!H{< zA7wHWTEABfOTWO@=`T`u4NyTc0hTERLp(&L|7}M{=HGVI+4@*bC1?+s7edJK9{A5e zuwxB(E^OE!)~2pu&kE{w;9lh0_IFo%#qBdeu;)=nTfmN`(vtu?scU;NmuCSEQr8=Z72IEs0`2g}CgD)>alI0}H;`y9 zDRW@Ux`H1huE(BQWF;wcVPHJdm+(`82R9WOk}~c>JhPGDt3o>y^(6Ib(2I+t@YO+Q z7j;R!CiGf`mZYo&oA5(*C1u#qWB$8T%bw%@b=v+@&m_6?I*y3@llIX z(1(ISX>FoZdk?O)38&T`&hYrM7WYWx6Pu_}bl6aA58`iu^8pSGM_#DnCfLi0gUeYY zjr_&pbV92t7o&awaLFZwaMU5NLjvF22Po;lF|7ng-Ru&?DFhR9Byh!B3*cwG z$Mw#HxLV{bG@9NE8Vy@^qotU@1cnbql{z;z`^omjPw;;7|EDuwgPB3p7xjHc6$9b; zw|zzvf`3qn?lbHqF12I#FX$zk@c;CZX#TFZGMuQ9MHK_#`2V(-C^7$ngEFiE@i6<~ z184#K(=0xEZqEPF`cbnBj&eFRMI{{Z+v>fO1@l!r$esjiR}2}~6ml6H{0BghY&^?U zDkxC1r-HhF0&cGSevptP}pvtJkYAa@@(?@m4*US58F{++x#2YL7hb?WR96zt&_>=x~g0fBokC&49*G?oUMd9&T=){CWdmpcXVXHr9^{uc$v6b)gLD;zvICADFB_=6}Hd HJ{I^dR(jIp diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls index d0d5edf32ef595250c6e33c3648034bbf6eece09..f786572a41e53f951b18190db465b6ef6144bf2d 100644 GIT binary patch delta 875 zcmZ8gO=uHQ5T1E?yV*^mO}9x*1*vJZmV#2KP}EIQ(^MK;EjCt!5{068=%u2fEwqU! zJv0%u&x3yy3m&}MMet;EDI$6;9<<=46x72C7D26X-ZqKFfq66Y&G+8So41?0hq?QB z$Hbk_qpuO0gu*V>Hvqt&QmG`hk^Ehi*t*L;pg#KY-TI!cj~EeG_zm{`p!mrraoQSF z){uEXjJiW*W6io#K2&D{+fWtZKveC8C#SCcvW5c7zMu&c8l78}Zt|F@Z48PN!GIW! zw28r>pRA$u{FgDrrwGR?*J^HjQ_s8|;@hD__6wL$17PoW&QZDW6X(=}`7ZS}QG{9XYL+Jb;7gWBn@`@A#IJ_E-hx zl3REfeS5s+R@u*|9}N(DE^iFT)XMpW3l%oO5-JS&hd0CGwi(8&;+fgbq6e&HvlSD~ zySu1w4in&`mBZFhvKlL(KqlB+{>LJ=*(1AA5dmVn@2--Ulw_7`L(>l4v~)UbCE9! z@yjBY%86n;Hs2Xy?lUYnGcwm}?MQSneU%u+Qs3;VxR~r0ZCn$@4(qIB9bw>sLmm|Mim#*u@w*Cg-z@Z=T2Q$)m*1uz`V*L5P8& zMo`c}!GVQ=jaT6Tg9rmceDXnI@yQ$_rffb8U({ZEZgv*A%fqNKSy54#hmnB=sFVrl zg8%;~hbUT2&XyBkuI12}yiieC5?PYrKTr)AfMg#k3R~cmWvJzVsRhwqK#Z(*vxw4V zNv6$alV4gp)&F70VgRWIVO9pltKHqftifXS--Fp07(;`7{h!8iSMi2?sAK`j^~^f$ zr_l>#b_dT60xDYAEffTjd73Jp4&;KEJ<$S5ATCfLh`FtZF@cGJkv;N7&VL3jpiTB> z3=BL#`?wewCUeNM z#+g9tu5xT*6arcf1Hd%$AEag--%>