From 599ceb7ab865b1dd7ea6b669a679e716f0647c4e Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 27 Mar 2026 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?20260327=20=E7=AE=A1=E7=BA=BF=E5=92=8C=E7=84=8A?= =?UTF-8?q?=E5=8F=A3=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DB_DS_2026-03-26_bwj(试压包资料目录初始值).sql | 48 ++ .../版本日志/HJGLDB_DS_2026-03-26_bwj.sql | 111 ++++ HJGL_DS/BLL/BLL.csproj | 2 + HJGL_DS/BLL/Common/Const.cs | 5 + HJGL_DS/BLL/SYBData/ApplicationFormService.cs | 77 +++ .../SYBData/SYBData_FileDirectoryService.cs | 26 + .../HJGL_DataIn/工艺管线参数信息导入模板.xls | Bin 96256 -> 96256 bytes .../Excel/HJGL_DataIn/焊口信息导入模板.xls | Bin 37888 -> 48640 bytes .../File/Fastreport/SYBData/试压包封面.frx | 10 +- .../Fastreport/SYBData/试压包资料目录.frx | 111 ++++ HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 16 + .../FineUIPro.Web/FineUIPro.Web.csproj.user | 4 +- .../FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs | 79 +-- .../HJGL/DataIn/PipeLineIn.aspx.cs | 72 ++- .../HJGL/WeldingManage/JointInfoEdit.aspx | 6 +- .../WeldingManage/PipelineManageEdit.aspx | 42 +- .../SYBData/ApplicationForm.aspx | 16 + .../SYBData/ApplicationForm.aspx.cs | 17 + .../SYBData/ApplicationForm.aspx.designer.cs | 26 + .../FineUIPro.Web/SYBData/SYBDataList.aspx | 107 ++++ .../FineUIPro.Web/SYBData/SYBDataList.aspx.cs | 451 +++++++++++++++ .../SYBData/SYBDataList.aspx.designer.cs | 179 ++++++ HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/Model/Model.cs | 528 +++++++++++++++++- HJGL_DS/WebAPI/WebAPI.csproj.user | 4 +- 25 files changed, 1868 insertions(+), 71 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj(试压包资料目录初始值).sql create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-03-26_bwj.sql create mode 100644 HJGL_DS/BLL/SYBData/ApplicationFormService.cs create mode 100644 HJGL_DS/BLL/SYBData/SYBData_FileDirectoryService.cs create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/SYBData/试压包资料目录.frx create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/ApplicationForm.aspx create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/ApplicationForm.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/ApplicationForm.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.designer.cs 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 3defb88b9957f05d3879fa31d24bc496c60ea880..fbfc92cc876c54b68c314bb6ed328c98578351dd 100644 GIT binary patch delta 2113 zcmbVNe@t6d6h5c4wZDIt*SEr2##CUC0E5j$5lra9(o7jk%ycoJnF(74W5A-*Z0*c2 zM#Rk=GuV_(om&>Cg1jXXgF;NyxyeG}l4-_FV`id%%ppuZ4nzKkUnW?|t8Q z?m6E(z3<)llp#K47~HORzOv`#osAc+VNIau>T91)Qir|^|D-$mS-hg$G0f=kUHZ+E zFYf{X8;?Ug>^zR}@bY-GcXKCtsm5yZxEMaPy=6!1j*iauCp&ky12tHS%<&nENQ_y% zAGP6H8nf2nIWpTqE>5!`oXTuX)MtxiMQv*+VXMY=3fm<<*Qd^9?K26fxe0rIENyNvBC8|1 z#TE5S@RM94Q@n8a;9Qk-=Lpq{^2fACLa10Iq19mxBlDX z2Qp6p^Ai00f1>Pi#&u|<9=G&A&NtmbN_c#-k-PZEEU!7S5X4U(3@6yFk?dY6gKAEy zRT9d%Lrx~@cZd^e?S&5rP_xpP!A9f z0F0@A>~zy7$&Pt7%(vMo)gij?Ww@w^B~&ftQib0`2fRk~(SE`u*j z-ReKqmzid1DItP$BbYoVGoAf8KR+l!o3s!tK1 z{*3C{q&m($2~dwuqC?pp`oU|I#aBqJ%l<|~qoI^PCzVJNnv$#T3BH%9N0LvyDj}BB z;ecOXa$}!cIU9IbM|*Q!)V(S~C-Wnutd7uEcSq>jJrTNfZ-ge8zrp-%=55S{nX4#> zke|6i=BhY$GxJX~zptQ@YFE0bIao&dxp}Ad=AxQ=Bv0f23g)T!8ODyh$JE&M9D9-Z zO*t-QAhZIhHn)r>WEV~6Xu;oywaG>fJeEwbflWQm23py`3vA#h8+eZm;HpZpgice} z$}Y;u`BM3?VA_Yn%G*^3x8|PiG#z*auebsKLH>AC|Pu+uU>-wDnI@h;_3uNyH+*ZT@%QT~Jg z{KF-HM^wFP$jZn%r`Z^Z#jk00Mq*#mkb{v}`WkXFa?T+aBe6&{&CN(GX$^TGS_Gas z=w(r?V@>oi5^d6uAEL^@u~zh|I}m^B#Q|`On`BT*->A{?F1M#Y7<-QRF-`(}ewwfE z12hZ)93KYw@iT7m7u@QL0K=C7YQ6=ya224Qw}SPwvT{o#+#w4nvh Hw4?D~^_boR delta 1997 zcmbW2YfKzf6vzK(+1;`)*kyN_9ah}sAumCpLN!4wB4hATg_vN)nAV61CbqQ2SE7~m zLv0&EOM0qME5v8h)<;RVQ9_Jh;s=`mAx(XxP_ti5+L&5wqNOnnp4r*mP~7stN$%YH zJLk;*o_prboydYEvS1nQG-uPm>|EdFbJW<^_CQho9QT-a(Gk98UZSb!HOo~qz0ZHz zi_}g4PHAsQb4lAH%`5HTVB1UNsTC2?x3kGd4~1}|VwJ;kxO@}jG#cUep&5!T@w(@JIYP3-eBQ@VIP z!~0TmEzgj!euaLokvgGvg(GRVrL{xi)0KdvH2+4boLZ(_Hl>>RnV z#;0VOrQW1k^u_FmiNO6H<^SDzJ}01BMDwpDH=v8_mpK@YNzN8_d6hI?Tf*Cr)*DKA zx1{w}uBx1y@J_G#?CRe1IWJQt3vbC))i^0BO1KGU6kUAao2c>18nGw2v} zz-(mX;q!il?D`wzW+f2JNyeSUW*O!sXR+XRT}@QWnws^Pg} zH#dbBSS@q&bEUhup~%fMCGSMX3iF6-i#5Jf@Dx87a`RY09oGjXIMMGdG5B|hu?98% zN@HjN(3m4Dt!-%QDChExL4QD|vI{8ItUO8QCwx z3N;!z+-Q=Y&UeGX-U68LaUANi;J*1hj1a6uq{Yf3=ty5avYZv2C4{w zwX_x=tRs}w6Gqn)?rA1Wwh&r25N6v58`}x74no%^;b%oaT6MI4q^Ih@OzX)hyD8c+ d^Xf+y6?X$XG#vi=?`>qKLHBlQJ+gzW{{mhl*tq}z diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls index c47159ad4de564a5d4148b8839852f5eaf28b16d..fdbb3c05beb7e324be520a1e9de9ba57efd2a61d 100644 GIT binary patch delta 8675 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 acqR_L#*Umc;iCzulXYqPawOrWHv2yToVPpx 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 @@