diff --git a/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj(试压包资料目录初始值).sql b/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj(试压包资料目录初始值).sql new file mode 100644 index 0000000..8ddc5d8 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj(试压包资料目录初始值).sql @@ -0,0 +1,48 @@ +--ѹĿ¼ +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('7EF5A8B9-D870-46E0-B8F5-C18FFB698FE4','01','ѹ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('FFFC3AA1-933E-403A-BCB5-13208D607A5E','02','ѹĿ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('26F3F0BA-9924-45F2-837B-D9779E2253A5','03','չܵѹ/','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('9466B90D-F79F-41C7-89D1-355E7433B65A','04','ܵѹһ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('13FF4A67-775D-417A-9136-4C4A4B2AB7C7','05','ܵһ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('3006036E-3DBD-4479-8224-01129307806F','06','ѹͼ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('F9DA8782-7927-4DFB-845C-643DE483824C','07','ͼ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('3DDB2531-7D02-4A28-9A3C-A4C23BEB4B1D','08','ӹ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('3D94D403-763E-4A80-BCEF-D8B4CBEE197B','09','ܵϵͳѹʵȷϼ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('5CFF432E-7780-43C6-BC50-D84A7937373A','10','ܵϵͳѹʵ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('99F59210-2F4A-4F29-B1F8-316163B51E8E','11','ܵӽͷ߼ȷϱ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('3C77DC00-8F9A-4ACE-9DBA-9623F3F2CBFA','12','ܱܵ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('F7D30131-0BCB-4ABA-8CD8-22E2CD0A4E7C','13','ܵͳƱ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('3AEA4CC9-6648-421B-A835-58157E17D21A','14','ܵⱨ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('22F1561D-1B99-430D-97A6-7AEC791587B4','15','ܵӽͷȴ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('76508BB2-B1E3-42C7-B56A-9F334220EE22','16','ܵӽͷӲȼⱨ','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('31B13F35-E3C7-407D-ADFD-8C09F5E60033','17','ܵϵͳѹʱä尲װ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('C529532A-D1D7-4FBB-B0A2-B16315A3F062','18','֧/ܰװ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('269FEEFB-9FF9-4377-88B0-FDEAFEAE1064','19','/̶аװ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('F0A3B172-48ED-4689-AE86-330B802ECAAE','20','ܵϵͳѹʱä尲װ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('6546DC4F-E36C-4AEA-9F10-5253FD5F581E','21','ܵӵؼ¼','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('93F3496E-A197-431E-BB38-4244AE95DDFB','22','ѹβ嵥','') +insert into SYBData_FileDirectory(FileDirectoryId,FileCode,FileName,CompletionStatus) +values('6F151059-CCBC-4D5F-A480-35422F14DD09','23','ˮʷ','') +go \ No newline at end of file diff --git a/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj.sql new file mode 100644 index 0000000..ced0e95 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj.sql @@ -0,0 +1,111 @@ + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('B3F05879-2439-4445-8449-AA2010FA0961','ѹĿ¼','SYBData/SYBDataList.aspx',20,'3EAFF140-E5CA-4978-B83D-D2C9F36E0D52','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('BAAFECDF-F813-491A-B190-7FE7E5A9C4FA','B3F05879-2439-4445-8449-AA2010FA0961','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('50AFF2C8-B3B9-4113-B2E0-C0024055E867','B3F05879-2439-4445-8449-AA2010FA0961','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('100D68F8-0249-4758-9125-70E122887472','B3F05879-2439-4445-8449-AA2010FA0961','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('8A6DC981-653A-4043-BC1C-E3F20C329372','B3F05879-2439-4445-8449-AA2010FA0961','',4) +go + +CREATE TABLE [dbo].[SYBData_FileDirectory]( + [FileDirectoryId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [FileCode] [nvarchar](50) NULL, + [FileName] [nvarchar](50) NULL, + [CompletionStatus] [nvarchar](50) NULL, + CONSTRAINT [PK_SYBData_FileDirectory] PRIMARY KEY CLUSTERED +( + [FileDirectoryId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SYBData_FileDirectory] WITH CHECK ADD CONSTRAINT [FK_SYBData_FileDirectory_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[SYBData_FileDirectory] CHECK CONSTRAINT [FK_SYBData_FileDirectory_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory', @level2type=N'COLUMN',@level2name=N'FileDirectoryId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory', @level2type=N'COLUMN',@level2name=N'FileCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory', @level2type=N'COLUMN',@level2name=N'FileName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory', @level2type=N'COLUMN',@level2name=N'CompletionStatus' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹĿ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_FileDirectory' +GO + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('71F70139-5281-480D-9787-7065BDA8A290','չܵѹ/','SYBData/ApplicationForm.aspx',30,'3EAFF140-E5CA-4978-B83D-D2C9F36E0D52','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('C24FBAD8-3BB9-4C56-A454-79B1A83AD2CA','71F70139-5281-480D-9787-7065BDA8A290','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('AEA0D59A-0229-40B6-8EBD-11EB35B4F469','71F70139-5281-480D-9787-7065BDA8A290','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('DA2B8B8D-EBEF-46C4-B912-EA7C91360BDE','71F70139-5281-480D-9787-7065BDA8A290','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('86538266-35CD-4B4A-9598-7F7F95BE69FA','71F70139-5281-480D-9787-7065BDA8A290','',4) +go + + +CREATE TABLE [dbo].[SYBData_ApplicationForm]( + [ApplicationFormId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [ApplicationFormCode] [nvarchar](50) NULL, + [SupervisionUnit] [nvarchar](50) NULL, + [Contents] [nvarchar](500) NULL, + [ProfessionalEngineer] [nvarchar](50) NULL, + [ApplicationDate] [datetime] NULL, + CONSTRAINT [PK_SYBData_ApplicationForm] PRIMARY KEY CLUSTERED +( + [ApplicationFormId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SYBData_ApplicationForm] WITH CHECK ADD CONSTRAINT [FK_SYBData_ApplicationForm_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[SYBData_ApplicationForm] CHECK CONSTRAINT [FK_SYBData_ApplicationForm_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'ApplicationFormId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'ApplicationFormCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'SupervisionUnit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'Contents' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵʦ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'ProfessionalEngineer' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm', @level2type=N'COLUMN',@level2name=N'ApplicationDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'չܵѹ/' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ApplicationForm' +GO diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 0c92bc0..8fbfeda 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -299,7 +299,9 @@ + + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 3ea1eaf..c97603f 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1922,6 +1922,11 @@ namespace BLL /// 试压包封面 /// public const string SYBData_CoverMenuId = "66113AA7-C41B-4FE6-BAA0-69B3E74592A3"; + + /// + /// 试压包资料目录 + /// + public const string SYBData_FileDirectoryMenuId = "B3F05879-2439-4445-8449-AA2010FA0961"; #endregion #region 报表对应ID diff --git a/HJGL_DS/BLL/SYBData/ApplicationFormService.cs b/HJGL_DS/BLL/SYBData/ApplicationFormService.cs new file mode 100644 index 0000000..cb8f7f5 --- /dev/null +++ b/HJGL_DS/BLL/SYBData/ApplicationFormService.cs @@ -0,0 +1,77 @@ +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 工艺管道试压包报审/报验申请表 + /// + public class ApplicationFormService + { + /// + /// 根据项目Id获取工艺管道试压包报审/报验申请表 + /// + /// + /// + public static Model.SYBData_ApplicationForm GetApplicationFormByProjectId(string projectId) + { + return Funs.DB.SYBData_ApplicationForm.FirstOrDefault(e => e.ProjectId == projectId); + } + + /// + /// 添加工艺管道试压包报审/报验申请表 + /// + /// + public static void AddApplicationForm(Model.SYBData_ApplicationForm applicationForm) + { + SGGLDB db = Funs.DB; + Model.SYBData_ApplicationForm newApplicationForm = new Model.SYBData_ApplicationForm(); + newApplicationForm.ApplicationFormId = applicationForm.ApplicationFormId; + newApplicationForm.ProjectId = applicationForm.ProjectId; + newApplicationForm.ApplicationFormCode = applicationForm.ApplicationFormCode; + newApplicationForm.SupervisionUnit = applicationForm.SupervisionUnit; + newApplicationForm.Contents = applicationForm.Contents; + newApplicationForm.ProfessionalEngineer = applicationForm.ProfessionalEngineer; + newApplicationForm.ApplicationDate = applicationForm.ApplicationDate; + db.SYBData_ApplicationForm.InsertOnSubmit(newApplicationForm); + } + + /// + /// 修改工艺管道试压包报审/报验申请表 + /// + /// + public static void UpdateApplicationForm(Model.SYBData_ApplicationForm applicationForm) + { + SGGLDB db = Funs.DB; + Model.SYBData_ApplicationForm newApplicationForm = db.SYBData_ApplicationForm.FirstOrDefault(e => e.ApplicationFormId == applicationForm.ApplicationFormId); + if (newApplicationForm != null) + { + newApplicationForm.ApplicationFormCode = applicationForm.ApplicationFormCode; + newApplicationForm.SupervisionUnit = applicationForm.SupervisionUnit; + newApplicationForm.Contents = applicationForm.Contents; + newApplicationForm.ProfessionalEngineer = applicationForm.ProfessionalEngineer; + newApplicationForm.ApplicationDate = applicationForm.ApplicationDate; + db.SubmitChanges(); + } + } + + /// + /// 根据项目Id删除工艺管道试压包报审/报验申请表 + /// + /// + public static void DeleteApplicationFormByProjectId(string projectId) + { + SGGLDB db = Funs.DB; + Model.SYBData_ApplicationForm data = db.SYBData_ApplicationForm.FirstOrDefault(e => e.ProjectId == projectId); + if (data != null) + { + db.SYBData_ApplicationForm.DeleteOnSubmit(data); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/BLL/SYBData/SYBData_FileDirectoryService.cs b/HJGL_DS/BLL/SYBData/SYBData_FileDirectoryService.cs new file mode 100644 index 0000000..844576c --- /dev/null +++ b/HJGL_DS/BLL/SYBData/SYBData_FileDirectoryService.cs @@ -0,0 +1,26 @@ +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 试压包资料目录 + /// + public class SYBData_FileDirectoryService + { + public static void DeleteFileDirectoryById(string id) + { + SGGLDB db = Funs.DB; + Model.SYBData_FileDirectory data = db.SYBData_FileDirectory.FirstOrDefault(e => e.FileDirectoryId == id); + if (data != null) + { + db.SYBData_FileDirectory.DeleteOnSubmit(data); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/工艺管线参数信息导入模板.xls b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/工艺管线参数信息导入模板.xls index 3defb88..fbfc92c 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/工艺管线参数信息导入模板.xls and b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/工艺管线参数信息导入模板.xls differ diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls index c47159a..fdbb3c0 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls and b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls differ diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包封面.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包封面.frx index b218ea9..e8a9303 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包封面.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包封面.frx @@ -1,5 +1,5 @@  - + @@ -10,7 +10,7 @@ - + @@ -34,19 +34,19 @@ - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包资料目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包资料目录.frx new file mode 100644 index 0000000..a88ead4 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包资料目录.frx @@ -0,0 +1,111 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table2.PrintRow(0); + Table2.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 0663f3b..fc999c7 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1330,6 +1330,7 @@ + @@ -1361,6 +1362,7 @@ + @@ -7164,6 +7166,13 @@ ASPXCodeBehind + + ApplicationForm.aspx + ASPXCodeBehind + + + ApplicationForm.aspx + Cover.aspx ASPXCodeBehind @@ -7235,6 +7244,13 @@ WelderTrain.aspx + + SYBDataList.aspx + ASPXCodeBehind + + + SYBDataList.aspx + WebService1.asmx Component diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index abef49a..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,8 +1,8 @@ - + true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs index c317578..544e360 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs @@ -316,7 +316,7 @@ namespace FineUIPro.Web.HJGL.DataIn var getWeldSilk = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "1" && x.WMT_MatCode == col19);//焊丝 var getWeldMat = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "2" && x.WMT_MatCode == col20);//焊条 var getNDTRate = NDTRates.FirstOrDefault(x => x.NDTR_Name == col26);//探伤比例 - var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col28);//合格等级 + var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col27);//合格等级 if (string.IsNullOrEmpty(col2)) { result += "第" + (i + 2).ToString() + "行," + "焊口号不能为空" + "\n"; @@ -387,6 +387,17 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "该坡口类型不存在" + "\n"; } } + if (!string.IsNullOrEmpty(col8)) + { + if (col8 != "活动" && col8 != "固定") + { + result += "第" + (i + 2).ToString() + "行," + "焊口属性输入有误" + "\n"; + } + } + else + { + result += "第" + (i + 2).ToString() + "行," + "焊口属性不能为空" + "\n"; + } if (getWeldMethod == null) { if (string.IsNullOrEmpty(col9)) @@ -398,17 +409,6 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "该焊接方法不存在" + "\n"; } } - if (string.IsNullOrEmpty(col8)) - { - result += "第" + (i + 2).ToString() + "行," + "焊口属性不能为空" + "\n"; - } - if (!string.IsNullOrEmpty(col8)) - { - if (col8 != "活动" && col8 != "固定") - { - result += "第" + (i + 2).ToString() + "行," + "焊口属性输入有误" + "\n"; - } - } if (!string.IsNullOrEmpty(col10)) { try @@ -424,10 +424,6 @@ namespace FineUIPro.Web.HJGL.DataIn { result += "第" + (i + 2).ToString() + "行," + "外径不能为空" + "\n"; } - if (string.IsNullOrEmpty(col11)) - { - result += "第" + (i + 2).ToString() + "行," + "壁厚不能为空" + "\n"; - } if (!string.IsNullOrEmpty(col11)) { try @@ -439,20 +435,9 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "壁厚格式输入有误" + "\n"; } } - if (getNDTRate == null) + else { - if (string.IsNullOrEmpty(col27)) - { - result += "第" + (i + 2).ToString() + "行," + "探伤比例不能为空" + "\n"; - } - else - { - result += "第" + (i + 2).ToString() + "行," + "该探伤比例不存在" + "\n"; - } - } - if (string.IsNullOrEmpty(col12)) - { - result += "第" + (i + 2).ToString() + "行," + "寸径不能为空" + "\n"; + result += "第" + (i + 2).ToString() + "行," + "壁厚不能为空" + "\n"; } if (!string.IsNullOrEmpty(col12)) { @@ -465,13 +450,17 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "寸径格式输入有误" + "\n"; } } - if (!string.IsNullOrEmpty(col13)) + else { - if (col13 != "现场安装" && col13 != "预制") - { - result += "第" + (i + 2).ToString() + "行," + "焊接区域输入有误" + "\n"; - } + result += "第" + (i + 2).ToString() + "行," + "寸径不能为空" + "\n"; } + //if (!string.IsNullOrEmpty(col13)) + //{ + // if (col13 != "现场安装" && col13 != "预制") + // { + // result += "第" + (i + 2).ToString() + "行," + "焊接区域输入有误" + "\n"; + // } + //} if (!string.IsNullOrEmpty(col16)) { try @@ -573,6 +562,28 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "是否特殊格式输入有误" + "\n"; } } + if (getNDTRate == null) + { + if (string.IsNullOrEmpty(col26)) + { + result += "第" + (i + 2).ToString() + "行," + "探伤比例不能为空" + "\n"; + } + else + { + result += "第" + (i + 2).ToString() + "行," + "该探伤比例不存在" + "\n"; + } + } + if (getNDTClass==null) + { + if (string.IsNullOrEmpty(col27)) + { + result += "第" + (i + 2).ToString() + "行," + "合格等级不能为空" + "\n"; + } + else + { + result += "第" + (i + 2).ToString() + "行," + "该合格等级不存在" + "\n"; + } + } if (!string.IsNullOrEmpty(col29)) { try diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs index 58b62cd..62b4eed 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs @@ -274,7 +274,7 @@ namespace FineUIPro.Web.HJGL.DataIn string col8 = pds.Rows[i][8].ToString().Trim();//试压标号 string col9 = pds.Rows[i][9].ToString().Trim();//管道类别 string col10 = pds.Rows[i][10].ToString().Trim();//涂漆类别 - string col11 = pds.Rows[i][11].ToString().Trim();//绝热能力 + string col11 = pds.Rows[i][11].ToString().Trim();//绝热类别 string col12 = pds.Rows[i][12].ToString().Trim();//操作压力 string col13 = pds.Rows[i][13].ToString().Trim();//操作温度 string col14 = pds.Rows[i][14].ToString().Trim();//泄露性试验 @@ -353,6 +353,17 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "该材质不存在" + "\n"; } } + if (getMaterialStandard == null) + { + if (string.IsNullOrEmpty(col6)) + { + result += "第" + (i + 2).ToString() + "行," + "材质标准不能为空" + "\n"; + } + else + { + result += "第" + (i + 2).ToString() + "行," + "该材质标准不存在" + "\n"; + } + } if (getService == null) { if (string.IsNullOrEmpty(col7)) @@ -364,6 +375,37 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "该介质不存在" + "\n"; } } + if (PipeLineClass == null) + { + if (string.IsNullOrEmpty(col9)) + { + result += "第" + (i + 2).ToString() + "行," + "管道类别不能为空" + "\n"; + } + else + { + result += "第" + (i + 2).ToString() + "行," + "该管道类别不存在" + "\n"; + } + } + if (string.IsNullOrEmpty(col10)) + { + result += "第" + (i + 2).ToString() + "行," + "涂漆类别不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col11)) + { + result += "第" + (i + 2).ToString() + "行," + "绝热类别不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col12)) + { + result += "第" + (i + 2).ToString() + "行," + "操作压力不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col13)) + { + result += "第" + (i + 2).ToString() + "行," + "操作温度不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col14)) + { + result += "第" + (i + 2).ToString() + "行," + "泄露性试验不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col15)) { try @@ -375,6 +417,10 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "设计压力格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "设计压力不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col16)) { try @@ -386,6 +432,10 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "设计温度格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "设计温度不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col17)) { try @@ -397,6 +447,10 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "耐压试验格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "耐压试验不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col18)) { try @@ -408,6 +462,10 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "外径格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "外径不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col19)) { try @@ -419,6 +477,10 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "壁厚格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "壁厚不能为空" + "\n"; + } if (!string.IsNullOrEmpty(col20)) { try @@ -430,6 +492,14 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "管线长度格式输入有误" + "\n"; } } + else + { + result += "第" + (i + 2).ToString() + "行," + "管线长度不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col21)) + { + result += "第" + (i + 2).ToString() + "行," + "检测类别序号不能为空" + "\n"; + } if (getUnit != null && getProject != null) { var getIsoInfo = isoInfos.FirstOrDefault(x => x.ProjectId == getProject.ProjectId && x.ISO_IsoNo == col2); diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx index 0b40eec..dd2775f 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx @@ -114,7 +114,7 @@