diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-18_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-18_bwj.sql new file mode 100644 index 0000000..25a0594 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-09-18_bwj.sql @@ -0,0 +1,126 @@ + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','ҵܵװܱɽؼԺҪ','JGZL/IndustrialInstallationSummaryZhoushan.aspx',52,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('7D9788EA-5015-4C75-9345-6413C5CE31B7','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('4F1EFB19-F2B0-45FA-A23D-E099B0F349C6','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('987AB25A-D7ED-4955-B871-21CD85B75282','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('868F695F-2963-49AE-A479-4E6BCB90B061','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','ύ',4) +go + + +CREATE TABLE [dbo].[JGZL_IndustrialInstallationSummaryZhoushan]( + [SummaryId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [InstallationName] [nvarchar](50) NULL, + [TestPackageCode] [nvarchar](50) NULL, + [PipelineName] [nvarchar](50) NULL, + [PipelineCode] [nvarchar](50) NULL, + [PipelineLevel] [nvarchar](50) NULL, + [Material] [nvarchar](50) NULL, + [Medium] [nvarchar](50) NULL, + [Diameter] [decimal](18, 2) NULL, + [WallThickness] [decimal](18, 2) NULL, + [PipelineLength] [decimal](18, 2) NULL, + [WeldJointsCount] [int] NULL, + [PipeFittings] [int] NULL, + [StartPoint] [nvarchar](50) NULL, + [EndPoint] [nvarchar](50) NULL, + [DesignTemperature] [decimal](18, 2) NULL, + [DesignPressure] [decimal](18, 2) NULL, + [OperatingTemperature] [decimal](18, 2) NULL, + [OperatingPressure] [decimal](18, 2) NULL, + [PressureTestMedium] [nvarchar](50) NULL, + [PressureTestPressure] [decimal](18, 2) NULL, + [TestDate] [datetime] NULL, + CONSTRAINT [PK_JGZL_IndustrialInstallationSummaryZhoushan] PRIMARY KEY CLUSTERED +( + [SummaryId] 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].[JGZL_IndustrialInstallationSummaryZhoushan] WITH CHECK ADD CONSTRAINT [FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[JGZL_IndustrialInstallationSummaryZhoushan] CHECK CONSTRAINT [FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'SummaryId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @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'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'InstallationName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'TestPackageCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineLevel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Material' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Medium' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֱmm' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Diameter' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ʊںmm' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'WallThickness' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵȣm' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineLength' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'WeldJointsCount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipeFittings' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'StartPoint' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'յ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'EndPoint' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¶()' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'DesignTemperature' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ(MPa)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'DesignPressure' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¶ȡ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'OperatingTemperature' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹMpa' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'OperatingPressure' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PressureTestMedium' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹѹMpa' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PressureTestPressure' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'TestDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹܵװܱɽؼԺҪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan' +GO + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 8a53395..82fcd1f 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -264,6 +264,7 @@ + diff --git a/HJGL_DS/BLL/JGZL/IndustrialInstallationSummaryZhoushanService.cs b/HJGL_DS/BLL/JGZL/IndustrialInstallationSummaryZhoushanService.cs new file mode 100644 index 0000000..3625278 --- /dev/null +++ b/HJGL_DS/BLL/JGZL/IndustrialInstallationSummaryZhoushanService.cs @@ -0,0 +1,76 @@ +using Model; +using Org.BouncyCastle.Bcpg.OpenPgp; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 压力管道安装汇总表（舟山特检院要求表） + /// + public class IndustrialInstallationSummaryZhoushanService + { + /// + /// 根据项目Id获取压力管道安装汇总表（舟山特检院要求表） + /// + /// + /// + public static List GetInstallationSummaryZhoushanByProjectId(string projectId) + { + return (from x in Funs.DB.JGZL_IndustrialInstallationSummaryZhoushan where x.ProjectId == projectId select x).ToList(); + } + + /// + /// 增加 + /// + /// + public static void AddIndustrialInstallationSummaryZhoushan(Model.JGZL_IndustrialInstallationSummaryZhoushan zs) + { + SGGLDB db = Funs.DB; + Model.JGZL_IndustrialInstallationSummaryZhoushan newZS = new JGZL_IndustrialInstallationSummaryZhoushan(); + newZS.SummaryId = zs.SummaryId; + newZS.ProjectId= zs.ProjectId; + newZS.InstallationName= zs.InstallationName; + newZS.TestPackageCode = zs.TestPackageCode; + newZS.PipelineName = zs.PipelineName; + newZS.PipelineCode = zs.PipelineCode; + newZS.PipelineLevel = zs.PipelineLevel; + newZS.Material = zs.Material; + newZS.Medium= zs.Medium; + newZS.Diameter= zs.Diameter; + newZS.WallThickness= zs.WallThickness; + newZS.PipelineLength = zs.PipelineLength; + newZS.WeldJointsCount= zs.WeldJointsCount; + newZS.PipeFittings= zs.PipeFittings; + newZS.StartPoint= zs.StartPoint; + newZS.EndPoint= zs.EndPoint; + newZS.DesignTemperature= zs.DesignTemperature; + newZS.DesignPressure= zs.DesignPressure; + newZS.OperatingTemperature= zs.OperatingTemperature; + newZS.OperatingPressure = zs.OperatingPressure; + newZS.PressureTestPressure= zs.PressureTestPressure; + newZS.PressureTestMedium = zs.PressureTestMedium; + newZS.TestDate= zs.TestDate; + db.JGZL_IndustrialInstallationSummaryZhoushan.InsertOnSubmit(newZS); + db.SubmitChanges(); + } + + /// + /// 根据项目Id删除压力管道安装汇总表（舟山特检院要求表） + /// + /// + public static void DeleteIndustrialInstallationSummaryZhoushanByProjectId(string projectId) + { + SGGLDB db = Funs.DB; + var q = (from x in db.JGZL_IndustrialInstallationSummaryZhoushan where x.ProjectId == projectId select x).ToList(); + if (q.Count>0) + { + db.JGZL_IndustrialInstallationSummaryZhoushan.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx index abe1c64..45f5bdb 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -39,7 +39,7 @@ namespace FastReport } - + @@ -65,9 +65,9 @@ namespace FastReport - - - + + + @@ -182,10 +182,8 @@ namespace FastReport - - - + @@ -233,8 +231,8 @@ namespace FastReport - - + + @@ -283,7 +281,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条烘烤记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条烘烤记录.frx index d76e438..f609261 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条烘烤记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条烘烤记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -39,7 +39,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx index 0b405c8..c2a733b 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx @@ -20,17 +20,19 @@ + OnSort="Grid1_Sort" EnableTextSelection="True" AllowPaging="true" IsDatabasePaging="true" PageSize="50" + OnPageIndexChange="Grid1_PageIndexChange" > - - + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.cs index 321ea67..887b4f0 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.cs @@ -30,6 +30,8 @@ namespace FineUIPro.Web.HJGL.MaterialManage this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); this.drpProjectId.DataBind(); Funs.FineUIPleaseSelect(this.drpProjectId); + + BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true); BindGrid(); } } @@ -82,13 +84,18 @@ namespace FineUIPro.Web.HJGL.MaterialManage strSql += " AND BakeRecords.BakeDate <= @endDate"; listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim())); } + if (this.drpUnitStore.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitStore.SelectedValue)) + { + strSql += " AND BakeRecords.UnitStoreId = @UnitStoreId"; + listStr.Add(new SqlParameter("@UnitStoreId", this.drpUnitStore.SelectedValue)); + } strSql += " order by BakeRecords.BakeDate desc"; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; - //var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = tb; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; Grid1.DataBind(); } #endregion @@ -107,6 +114,19 @@ namespace FineUIPro.Web.HJGL.MaterialManage } #endregion + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + #region 提交 /// /// 确定按钮 diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.designer.cs index c38596d..a5670d6 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.MaterialManage { - - - public partial class ElectrodeBakeRecordNewSelect { - +namespace FineUIPro.Web.HJGL.MaterialManage +{ + + + public partial class ElectrodeBakeRecordNewSelect + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Grid1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar3 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// drpProjectId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectId; - + /// /// txtStartDate 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStartDate; - + /// /// Label1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndDate 控件。 /// @@ -101,7 +103,16 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndDate; - + + /// + /// drpUnitStore 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitStore; + /// /// txtBrand 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtBrand; - + /// /// btnSearch 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// ToolbarFill1 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSure 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSure; - + /// /// Window2 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs index e6fda69..e637fc6 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs @@ -229,7 +229,7 @@ namespace FineUIPro.Web.JGZL BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportTable(dt); - initTemplatePath = "File\\Fastreport\\JGZL\\焊条烘烤记录.frx"; + initTemplatePath = "File\\Fastreport\\焊条烘烤记录.frx"; if (File.Exists(rootPath + initTemplatePath)) { diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index e2ab772..c62e76b 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -419,6 +419,9 @@ namespace Model partial void InsertJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); partial void UpdateJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); partial void DeleteJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); + partial void InsertJGZL_IndustrialInstallationSummaryZhoushan(JGZL_IndustrialInstallationSummaryZhoushan instance); + partial void UpdateJGZL_IndustrialInstallationSummaryZhoushan(JGZL_IndustrialInstallationSummaryZhoushan instance); + partial void DeleteJGZL_IndustrialInstallationSummaryZhoushan(JGZL_IndustrialInstallationSummaryZhoushan instance); partial void InsertJGZL_IndustrialPipelineInstallationQualityCertificate(JGZL_IndustrialPipelineInstallationQualityCertificate instance); partial void UpdateJGZL_IndustrialPipelineInstallationQualityCertificate(JGZL_IndustrialPipelineInstallationQualityCertificate instance); partial void DeleteJGZL_IndustrialPipelineInstallationQualityCertificate(JGZL_IndustrialPipelineInstallationQualityCertificate instance); @@ -2058,6 +2061,14 @@ namespace Model } } + public System.Data.Linq.Table JGZL_IndustrialInstallationSummaryZhoushan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JGZL_IndustrialPipelineInstallationQualityCertificate { get @@ -5027,6 +5038,8 @@ namespace Model private EntitySet _JGZL_HandoverCertificate; + private EntitySet _JGZL_IndustrialInstallationSummaryZhoushan; + private EntitySet _JGZL_IndustrialPipelineInstallationQualityCertificate; private EntitySet _JGZL_IndustrialPipelineInstallationSummary; @@ -5231,6 +5244,7 @@ namespace Model this._JGZL_ElectrostaticGrounding = new EntitySet(new Action(this.attach_JGZL_ElectrostaticGrounding), new Action(this.detach_JGZL_ElectrostaticGrounding)); this._JGZL_FileDirectory = new EntitySet(new Action(this.attach_JGZL_FileDirectory), new Action(this.detach_JGZL_FileDirectory)); this._JGZL_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); + this._JGZL_IndustrialInstallationSummaryZhoushan = new EntitySet(new Action(this.attach_JGZL_IndustrialInstallationSummaryZhoushan), new Action(this.detach_JGZL_IndustrialInstallationSummaryZhoushan)); this._JGZL_IndustrialPipelineInstallationQualityCertificate = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationQualityCertificate), new Action(this.detach_JGZL_IndustrialPipelineInstallationQualityCertificate)); this._JGZL_IndustrialPipelineInstallationSummary = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationSummary), new Action(this.detach_JGZL_IndustrialPipelineInstallationSummary)); this._JGZL_InsulationAcceptanceRecord = new EntitySet(new Action(this.attach_JGZL_InsulationAcceptanceRecord), new Action(this.detach_JGZL_InsulationAcceptanceRecord)); @@ -6526,6 +6540,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project", Storage="_JGZL_IndustrialInstallationSummaryZhoushan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JGZL_IndustrialInstallationSummaryZhoushan + { + get + { + return this._JGZL_IndustrialInstallationSummaryZhoushan; + } + set + { + this._JGZL_IndustrialInstallationSummaryZhoushan.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_IndustrialPipelineInstallationQualityCertificate_Base_Project", Storage="_JGZL_IndustrialPipelineInstallationQualityCertificate", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JGZL_IndustrialPipelineInstallationQualityCertificate { @@ -7744,6 +7771,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JGZL_IndustrialInstallationSummaryZhoushan(JGZL_IndustrialInstallationSummaryZhoushan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JGZL_IndustrialInstallationSummaryZhoushan(JGZL_IndustrialInstallationSummaryZhoushan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JGZL_IndustrialPipelineInstallationQualityCertificate(JGZL_IndustrialPipelineInstallationQualityCertificate entity) { this.SendPropertyChanging(); @@ -88812,6 +88851,637 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_IndustrialInstallationSummaryZhoushan")] + public partial class JGZL_IndustrialInstallationSummaryZhoushan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _SummaryId; + + private string _ProjectId; + + private string _InstallationName; + + private string _TestPackageCode; + + private string _PipelineName; + + private string _PipelineCode; + + private string _PipelineLevel; + + private string _Material; + + private string _Medium; + + private System.Nullable _Diameter; + + private System.Nullable _WallThickness; + + private System.Nullable _PipelineLength; + + private System.Nullable _WeldJointsCount; + + private System.Nullable _PipeFittings; + + private string _StartPoint; + + private string _EndPoint; + + private System.Nullable _DesignTemperature; + + private System.Nullable _DesignPressure; + + private System.Nullable _OperatingTemperature; + + private System.Nullable _OperatingPressure; + + private string _PressureTestMedium; + + private System.Nullable _PressureTestPressure; + + private System.Nullable _TestDate; + + private EntityRef _Base_Project; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnSummaryIdChanging(string value); + partial void OnSummaryIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationNameChanging(string value); + partial void OnInstallationNameChanged(); + partial void OnTestPackageCodeChanging(string value); + partial void OnTestPackageCodeChanged(); + partial void OnPipelineNameChanging(string value); + partial void OnPipelineNameChanged(); + partial void OnPipelineCodeChanging(string value); + partial void OnPipelineCodeChanged(); + partial void OnPipelineLevelChanging(string value); + partial void OnPipelineLevelChanged(); + partial void OnMaterialChanging(string value); + partial void OnMaterialChanged(); + partial void OnMediumChanging(string value); + partial void OnMediumChanged(); + partial void OnDiameterChanging(System.Nullable value); + partial void OnDiameterChanged(); + partial void OnWallThicknessChanging(System.Nullable value); + partial void OnWallThicknessChanged(); + partial void OnPipelineLengthChanging(System.Nullable value); + partial void OnPipelineLengthChanged(); + partial void OnWeldJointsCountChanging(System.Nullable value); + partial void OnWeldJointsCountChanged(); + partial void OnPipeFittingsChanging(System.Nullable value); + partial void OnPipeFittingsChanged(); + partial void OnStartPointChanging(string value); + partial void OnStartPointChanged(); + partial void OnEndPointChanging(string value); + partial void OnEndPointChanged(); + partial void OnDesignTemperatureChanging(System.Nullable value); + partial void OnDesignTemperatureChanged(); + partial void OnDesignPressureChanging(System.Nullable value); + partial void OnDesignPressureChanged(); + partial void OnOperatingTemperatureChanging(System.Nullable value); + partial void OnOperatingTemperatureChanged(); + partial void OnOperatingPressureChanging(System.Nullable value); + partial void OnOperatingPressureChanged(); + partial void OnPressureTestMediumChanging(string value); + partial void OnPressureTestMediumChanged(); + partial void OnPressureTestPressureChanging(System.Nullable value); + partial void OnPressureTestPressureChanged(); + partial void OnTestDateChanging(System.Nullable value); + partial void OnTestDateChanged(); + #endregion + + public JGZL_IndustrialInstallationSummaryZhoushan() + { + this._Base_Project = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SummaryId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string SummaryId + { + get + { + return this._SummaryId; + } + set + { + if ((this._SummaryId != value)) + { + this.OnSummaryIdChanging(value); + this.SendPropertyChanging(); + this._SummaryId = value; + this.SendPropertyChanged("SummaryId"); + this.OnSummaryIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationName", DbType="NVarChar(50)")] + public string InstallationName + { + get + { + return this._InstallationName; + } + set + { + if ((this._InstallationName != value)) + { + this.OnInstallationNameChanging(value); + this.SendPropertyChanging(); + this._InstallationName = value; + this.SendPropertyChanged("InstallationName"); + this.OnInstallationNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageCode", DbType="NVarChar(50)")] + public string TestPackageCode + { + get + { + return this._TestPackageCode; + } + set + { + if ((this._TestPackageCode != value)) + { + this.OnTestPackageCodeChanging(value); + this.SendPropertyChanging(); + this._TestPackageCode = value; + this.SendPropertyChanged("TestPackageCode"); + this.OnTestPackageCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineName", DbType="NVarChar(50)")] + public string PipelineName + { + get + { + return this._PipelineName; + } + set + { + if ((this._PipelineName != value)) + { + this.OnPipelineNameChanging(value); + this.SendPropertyChanging(); + this._PipelineName = value; + this.SendPropertyChanged("PipelineName"); + this.OnPipelineNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + public string PipelineCode + { + get + { + return this._PipelineCode; + } + set + { + if ((this._PipelineCode != value)) + { + this.OnPipelineCodeChanging(value); + this.SendPropertyChanging(); + this._PipelineCode = value; + this.SendPropertyChanged("PipelineCode"); + this.OnPipelineCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineLevel", DbType="NVarChar(50)")] + public string PipelineLevel + { + get + { + return this._PipelineLevel; + } + set + { + if ((this._PipelineLevel != value)) + { + this.OnPipelineLevelChanging(value); + this.SendPropertyChanging(); + this._PipelineLevel = value; + this.SendPropertyChanged("PipelineLevel"); + this.OnPipelineLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")] + public string Material + { + get + { + return this._Material; + } + set + { + if ((this._Material != value)) + { + this.OnMaterialChanging(value); + this.SendPropertyChanging(); + this._Material = value; + this.SendPropertyChanged("Material"); + this.OnMaterialChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Medium", DbType="NVarChar(50)")] + public string Medium + { + get + { + return this._Medium; + } + set + { + if ((this._Medium != value)) + { + this.OnMediumChanging(value); + this.SendPropertyChanging(); + this._Medium = value; + this.SendPropertyChanged("Medium"); + this.OnMediumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Diameter", DbType="Decimal(18,2)")] + public System.Nullable Diameter + { + get + { + return this._Diameter; + } + set + { + if ((this._Diameter != value)) + { + this.OnDiameterChanging(value); + this.SendPropertyChanging(); + this._Diameter = value; + this.SendPropertyChanged("Diameter"); + this.OnDiameterChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WallThickness", DbType="Decimal(18,2)")] + public System.Nullable WallThickness + { + get + { + return this._WallThickness; + } + set + { + if ((this._WallThickness != value)) + { + this.OnWallThicknessChanging(value); + this.SendPropertyChanging(); + this._WallThickness = value; + this.SendPropertyChanged("WallThickness"); + this.OnWallThicknessChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineLength", DbType="Decimal(18,2)")] + public System.Nullable PipelineLength + { + get + { + return this._PipelineLength; + } + set + { + if ((this._PipelineLength != value)) + { + this.OnPipelineLengthChanging(value); + this.SendPropertyChanging(); + this._PipelineLength = value; + this.SendPropertyChanged("PipelineLength"); + this.OnPipelineLengthChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointsCount", DbType="Int")] + public System.Nullable WeldJointsCount + { + get + { + return this._WeldJointsCount; + } + set + { + if ((this._WeldJointsCount != value)) + { + this.OnWeldJointsCountChanging(value); + this.SendPropertyChanging(); + this._WeldJointsCount = value; + this.SendPropertyChanged("WeldJointsCount"); + this.OnWeldJointsCountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeFittings", DbType="Int")] + public System.Nullable PipeFittings + { + get + { + return this._PipeFittings; + } + set + { + if ((this._PipeFittings != value)) + { + this.OnPipeFittingsChanging(value); + this.SendPropertyChanging(); + this._PipeFittings = value; + this.SendPropertyChanged("PipeFittings"); + this.OnPipeFittingsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartPoint", DbType="NVarChar(50)")] + public string StartPoint + { + get + { + return this._StartPoint; + } + set + { + if ((this._StartPoint != value)) + { + this.OnStartPointChanging(value); + this.SendPropertyChanging(); + this._StartPoint = value; + this.SendPropertyChanged("StartPoint"); + this.OnStartPointChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndPoint", DbType="NVarChar(50)")] + public string EndPoint + { + get + { + return this._EndPoint; + } + set + { + if ((this._EndPoint != value)) + { + this.OnEndPointChanging(value); + this.SendPropertyChanging(); + this._EndPoint = value; + this.SendPropertyChanged("EndPoint"); + this.OnEndPointChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignTemperature", DbType="Decimal(18,2)")] + public System.Nullable DesignTemperature + { + get + { + return this._DesignTemperature; + } + set + { + if ((this._DesignTemperature != value)) + { + this.OnDesignTemperatureChanging(value); + this.SendPropertyChanging(); + this._DesignTemperature = value; + this.SendPropertyChanged("DesignTemperature"); + this.OnDesignTemperatureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignPressure", DbType="Decimal(18,2)")] + public System.Nullable DesignPressure + { + get + { + return this._DesignPressure; + } + set + { + if ((this._DesignPressure != value)) + { + this.OnDesignPressureChanging(value); + this.SendPropertyChanging(); + this._DesignPressure = value; + this.SendPropertyChanged("DesignPressure"); + this.OnDesignPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperatingTemperature", DbType="Decimal(18,2)")] + public System.Nullable OperatingTemperature + { + get + { + return this._OperatingTemperature; + } + set + { + if ((this._OperatingTemperature != value)) + { + this.OnOperatingTemperatureChanging(value); + this.SendPropertyChanging(); + this._OperatingTemperature = value; + this.SendPropertyChanged("OperatingTemperature"); + this.OnOperatingTemperatureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperatingPressure", DbType="Decimal(18,2)")] + public System.Nullable OperatingPressure + { + get + { + return this._OperatingPressure; + } + set + { + if ((this._OperatingPressure != value)) + { + this.OnOperatingPressureChanging(value); + this.SendPropertyChanging(); + this._OperatingPressure = value; + this.SendPropertyChanged("OperatingPressure"); + this.OnOperatingPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTestMedium", DbType="NVarChar(50)")] + public string PressureTestMedium + { + get + { + return this._PressureTestMedium; + } + set + { + if ((this._PressureTestMedium != value)) + { + this.OnPressureTestMediumChanging(value); + this.SendPropertyChanging(); + this._PressureTestMedium = value; + this.SendPropertyChanged("PressureTestMedium"); + this.OnPressureTestMediumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTestPressure", DbType="Decimal(18,2)")] + public System.Nullable PressureTestPressure + { + get + { + return this._PressureTestPressure; + } + set + { + if ((this._PressureTestPressure != value)) + { + this.OnPressureTestPressureChanging(value); + this.SendPropertyChanging(); + this._PressureTestPressure = value; + this.SendPropertyChanged("PressureTestPressure"); + this.OnPressureTestPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestDate", DbType="DateTime")] + public System.Nullable TestDate + { + get + { + return this._TestDate; + } + set + { + if ((this._TestDate != value)) + { + this.OnTestDateChanging(value); + this.SendPropertyChanging(); + this._TestDate = value; + this.SendPropertyChanged("TestDate"); + this.OnTestDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.JGZL_IndustrialInstallationSummaryZhoushan.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JGZL_IndustrialInstallationSummaryZhoushan.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_IndustrialPipelineInstallationQualityCertificate")] public partial class JGZL_IndustrialPipelineInstallationQualityCertificate : INotifyPropertyChanging, INotifyPropertyChanged {