From 8433bb4ad7314576ccb32793859e28386704ea7e Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Fri, 9 Jun 2023 18:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=84=8A=E6=8E=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BD=95=E5=85=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2023-06-09.sql | 73 ++++ .../1-5焊接管理（Menu_HJGL）.sql | 10 + SGGL/BLL/BLL.csproj | 1 + SGGL/BLL/Common/Const.cs | 4 + SGGL/BLL/HJGL/FL/FLDataService.cs | 79 ++++ SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx | 2 +- .../DataShow/HJGLWelding.aspx.cs | 102 +++-- SGGL/FineUIPro.Web/ErrLog.txt | 53 +++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 + SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx | 98 +++++ SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.cs | 204 ++++++++++ .../HJGL/FL/HJGLData.aspx.designer.cs | 141 +++++++ SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx | 41 ++ .../HJGL/FL/HJGLDataEdit.aspx.cs | 83 ++++ .../HJGL/FL/HJGLDataEdit.aspx.designer.cs | 105 +++++ SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 2 +- SGGL/Model/Model.cs | 379 ++++++++++++++++++ 17 files changed, 1336 insertions(+), 57 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-06-09.sql create mode 100644 SGGL/BLL/HJGL/FL/FLDataService.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-06-09.sql b/DataBase/版本日志/SGGLDB_WH_2023-06-09.sql new file mode 100644 index 00000000..5826ee7c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-06-09.sql @@ -0,0 +1,73 @@ +INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES ( N'90267927-3469-48E9-BF02-C4987A6660F7',N'¼','HJGL/FL/HJGLData.aspx',80,N'0',N'Menu_HJGL',0,1,1) +GO + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'5DCCAAE0-5709-430D-A889-837466CF3B10',N'90267927-3469-48E9-BF02-C4987A6660F7',N'',1) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'C444B83C-96B8-4593-BACE-0AD2E47717CC',N'90267927-3469-48E9-BF02-C4987A6660F7',N'޸',2) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'36F79E8F-FA65-424C-BE5C-74EE17758668',N'90267927-3469-48E9-BF02-C4987A6660F7',N'ɾ',3) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'23439251-DAF5-459E-870B-0D868F306D21',N'90267927-3469-48E9-BF02-C4987A6660F7',N'',4) + +GO + +delete from Sys_ButtonToMenu where MenuId='6035E549-66FF-4B6D-989B-BE99C9EF5EB7' +delete from Sys_Menu where MenuId='6035E549-66FF-4B6D-989B-BE99C9EF5EB7' +GO + +CREATE TABLE [dbo].[HJGL_FL_Data]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [TotalWeldQuantity] [nvarchar](50) NULL, + [TotalCompleted] [nvarchar](50) NULL, + [OneTimeFilmAmount] [nvarchar](50) NULL, + [OneTimeFilmQualifiedAmount] [nvarchar](50) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_HJGL_FL_Data] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[HJGL_FL_Data] WITH CHECK ADD CONSTRAINT [FK_HJGL_FL_Data_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[HJGL_FL_Data] CHECK CONSTRAINT [FK_HJGL_FL_Data_Base_Project] +GO + +ALTER TABLE [dbo].[HJGL_FL_Data] WITH CHECK ADD CONSTRAINT [FK_HJGL_FL_Data_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[HJGL_FL_Data] CHECK CONSTRAINT [FK_HJGL_FL_Data_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'Id' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @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'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'TotalWeldQuantity' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɴ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'TotalCompleted' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'OneTimeFilmAmount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϸƬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'OneTimeFilmQualifiedAmount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FL_Data' +GO + + diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql index 033e7ade..3b25462b 100644 --- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql +++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql @@ -33,6 +33,16 @@ GO INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'407DB594-D61C-4349-AE52-B5D635FF8C2A',N'6035E549-66FF-4B6D-989B-BE99C9EF5EB7',N'ɾ',3) INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'36119E83-A0DF-4955-A076-E58EDFD2ECD6',N'6035E549-66FF-4B6D-989B-BE99C9EF5EB7',N'',4) +GO + +INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES ( N'90267927-3469-48E9-BF02-C4987A6660F7',N'¼','HJGL/FL/HJGLData.aspx',80,N'0',N'Menu_HJGL',0,1,1) +GO + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'5DCCAAE0-5709-430D-A889-837466CF3B10',N'90267927-3469-48E9-BF02-C4987A6660F7',N'',1) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'C444B83C-96B8-4593-BACE-0AD2E47717CC',N'90267927-3469-48E9-BF02-C4987A6660F7',N'޸',2) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'36F79E8F-FA65-424C-BE5C-74EE17758668',N'90267927-3469-48E9-BF02-C4987A6660F7',N'ɾ',3) + INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'23439251-DAF5-459E-870B-0D868F306D21',N'90267927-3469-48E9-BF02-C4987A6660F7',N'',4) + GO --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('60F4B988-4D1D-48D6-A959-2EA4BD2978A1','','',10,'0','Menu_HJGL',0,0,1) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 802d28a2..f4f68133 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -321,6 +321,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 370c8e30..2918270d 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3731,6 +3731,10 @@ namespace BLL /// public const string ForeignControlPointMenuId = "FCD749CB-C52A-4C88-BB9D-02B511A2CC24"; + /// + /// 焊接数据 + /// + public const string FLDataMenuId = "90267927-3469-48E9-BF02-C4987A6660F7"; /// /// 项目资料库 diff --git a/SGGL/BLL/HJGL/FL/FLDataService.cs b/SGGL/BLL/HJGL/FL/FLDataService.cs new file mode 100644 index 00000000..6f1e0dd4 --- /dev/null +++ b/SGGL/BLL/HJGL/FL/FLDataService.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections; + +namespace BLL +{ + public static class FLDataService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取资料发放登记 + /// + /// + /// + public static Model.HJGL_FL_Data GetDataById(string Id) + { + return Funs.DB.HJGL_FL_Data.FirstOrDefault(e => e.Id == Id); + } + + /// + /// 添加资料发放登记 + /// + /// + public static void AddData(Model.HJGL_FL_Data Data) + { + Model.SGGLDB db = Funs.DB; + Model.HJGL_FL_Data newData = new Model.HJGL_FL_Data(); + newData.Id = Data.Id; + newData.ProjectId = Data.ProjectId; + newData.TotalWeldQuantity = Data.TotalWeldQuantity; + newData.TotalCompleted = Data.TotalCompleted; + newData.OneTimeFilmAmount = Data.OneTimeFilmAmount; + newData.OneTimeFilmQualifiedAmount = Data.OneTimeFilmQualifiedAmount; + newData.CompileMan = Data.CompileMan; + newData.CompileDate = Data.CompileDate; + db.HJGL_FL_Data.InsertOnSubmit(newData); + db.SubmitChanges(); + } + + /// + /// 修改资料发放登记 + /// + /// + public static void UpdateData(Model.HJGL_FL_Data Data) + { + Model.SGGLDB db = Funs.DB; + Model.HJGL_FL_Data newData = db.HJGL_FL_Data.FirstOrDefault(e => e.Id == Data.Id); + if (newData != null) + { + newData.ProjectId = Data.ProjectId; + newData.TotalWeldQuantity = Data.TotalWeldQuantity; + newData.TotalCompleted = Data.TotalCompleted; + newData.OneTimeFilmAmount = Data.OneTimeFilmAmount; + newData.OneTimeFilmQualifiedAmount = Data.OneTimeFilmQualifiedAmount; + newData.CompileMan = Data.CompileMan; + newData.CompileDate = Data.CompileDate; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除资料发放登记 + /// + /// + public static void DeleteData(string Id) + { + Model.SGGLDB db = Funs.DB; + Model.HJGL_FL_Data Data = db.HJGL_FL_Data.FirstOrDefault(e => e.Id == Id); + if (Data != null) + { + db.HJGL_FL_Data.DeleteOnSubmit(Data); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx index 7e26e01b..ffe1ba53 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx @@ -68,7 +68,7 @@ - + diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs index 0e62c251..e5c7fed4 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { if (!IsPostBack) { - Funs.DropDownPageSize(this.ddlPageSize); + Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t @@ -29,7 +29,7 @@ namespace FineUIPro.Web.DataShow } } - + /// /// 绑定数据 /// @@ -58,7 +58,7 @@ namespace FineUIPro.Web.DataShow // cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text; //} - + SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -176,6 +176,17 @@ namespace FineUIPro.Web.DataShow cout1 += Funs.GetNewDecimalOrZero(item.TotalWeldQuantity); } } + else + { + var getD2 = (from x in Funs.DB.HJGL_FL_Data + where x.ProjectId == projectId.ToString() + orderby x.CompileDate descending + select x).FirstOrDefault(); + if (getD2 != null) + { + cout1 = Funs.GetNewDecimalOrZero(getD2.TotalWeldQuantity); + } + } } return cout1; } @@ -192,10 +203,6 @@ namespace FineUIPro.Web.DataShow { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - //var getD1 = from x in Funs.DB.PW_JointInfo - // join y in Funs.DB.BO_WeldReportMain on x.DReportID equals y.DReportID - // where x.ProjectId == projectId.ToString() - // select new { x.JOT_DoneDin, y.JOT_WeldDate }; var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity where x.ProjectId == projectId.ToString() select x; @@ -206,18 +213,17 @@ namespace FineUIPro.Web.DataShow cout1 += Funs.GetNewDecimalOrZero(item.TotalCompleted); } } - //if (datetime1.HasValue) - //{ - // getD1 = getD1.Where(x => x.JOT_WeldDate >= datetime1); - //} - //if (datetime2.HasValue) - //{ - // getD1 = getD1.Where(x => x.JOT_WeldDate <= datetime2); - //} - //if (getD1.Count() > 0) - //{ - // cout1 += getD1.Sum(x => x.JOT_DoneDin ?? 0); - //} + else + { + var getD2 = (from x in Funs.DB.HJGL_FL_Data + where x.ProjectId == projectId.ToString() + orderby x.CompileDate descending + select x).FirstOrDefault(); + if (getD2 != null) + { + cout1 = Funs.GetNewDecimalOrZero(getD2.TotalCompleted); + } + } } return cout1; @@ -235,23 +241,6 @@ namespace FineUIPro.Web.DataShow { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - //var getC1 = from x in Funs.DB.CH_CheckItem - // join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID - // where y.ProjectId == projectId.ToString() - // select new { x.CHT_TotalFilm, y.CHT_CheckDate }; - - //if (datetime1.HasValue) - //{ - // getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1); - //} - //if (datetime2.HasValue) - //{ - // getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2); - //} - //if (getC1.Count() > 0) - //{ - // cout1 = getC1.Sum(x => x.CHT_TotalFilm ?? 0); - //} var getD1 = from x in Funs.DB.HJGL_FL_NdtList where x.ProjectId == projectId.ToString() select x; @@ -262,7 +251,17 @@ namespace FineUIPro.Web.DataShow cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmAmount); } } - + else + { + var getD2 = (from x in Funs.DB.HJGL_FL_Data + where x.ProjectId == projectId.ToString() + orderby x.CompileDate descending + select x).FirstOrDefault(); + if (getD2 != null) + { + cout1 = Funs.GetNewDecimalOrZero(getD2.OneTimeFilmAmount); + } + } } return cout1; } @@ -279,23 +278,6 @@ namespace FineUIPro.Web.DataShow { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - //var getC1 = from x in Funs.DB.CH_CheckItem - // join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID - // where y.ProjectId == projectId.ToString() - // select new { x.CHT_PassFilm, y.CHT_CheckDate }; - - //if (datetime1.HasValue) - //{ - // getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1); - //} - //if (datetime2.HasValue) - //{ - // getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2); - //} - //if (getC1.Count() > 0) - //{ - // cout1 = getC1.Sum(x => x.CHT_PassFilm ?? 0); - //} var getD1 = from x in Funs.DB.HJGL_FL_NdtList where x.ProjectId == projectId.ToString() select x; @@ -306,7 +288,17 @@ namespace FineUIPro.Web.DataShow cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmQualifiedAmount); } } - + else + { + var getD2 = (from x in Funs.DB.HJGL_FL_Data + where x.ProjectId == projectId.ToString() + orderby x.CompileDate descending + select x).FirstOrDefault(); + if (getD2 != null) + { + cout1 = Funs.GetNewDecimalOrZero(getD2.OneTimeFilmQualifiedAmount); + } + } } return cout1; } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 14236d57..591f4b4c 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -4196,3 +4196,56 @@ IP地址:::1 出错时间:06/08/2023 20:35:05 + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 System.Collections.Generic.Dictionary`2.Insert(TKey key, TValue value, Boolean add) + 在 FineUIPro.ResourceHelper.GetResourceContentAsBinary(String resName, String resVersion) + 在 FineUIPro.ResourceHandler.ProcessRequest(HttpContext context) + 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/09/2023 15:34:13 +出错文件:http://localhost:9733/res.axd?font=lib.fa.fontawesome.woff2&t=636128671740000000 +IP地址:::1 + +出错时间:06/09/2023 15:34:13 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'CompileManName' 无效。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.HJGL.FL.HJGLData.BindGrid() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\HJGL\FL\HJGLData.aspx.cs:行号 34 + 在 FineUIPro.Web.HJGL.FL.HJGLData.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\HJGL\FL\HJGLData.aspx.cs:行号 23 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/09/2023 17:52:24 +出错文件:http://localhost:9733/HJGL/FL/HJGLData.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/09/2023 17:52:24 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 44cad670..8237d88d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -598,6 +598,8 @@ + + @@ -8603,6 +8605,20 @@ WeldView.aspx + + HJGLData.aspx + ASPXCodeBehind + + + HJGLData.aspx + + + HJGLDataEdit.aspx + ASPXCodeBehind + + + HJGLDataEdit.aspx + NdtList.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx new file mode 100644 index 00000000..9f2a4ff7 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx @@ -0,0 +1,98 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLData.aspx.cs" Inherits="FineUIPro.Web.HJGL.FL.HJGLData" %> + + + + + + + 焊接数据 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.cs new file mode 100644 index 00000000..51e8ea97 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.cs @@ -0,0 +1,204 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.HJGL.FL +{ + public partial class HJGLData : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + BindGrid(); + } + } + public void BindGrid() + { + string strSql = @"select Id,TotalWeldQuantity, TotalCompleted, OneTimeFilmAmount, OneTimeFilmQualifiedAmount, + CompileMan, us.UserName as CompileManName,CompileDate + from HJGL_FL_Data C + left join Sys_User us on C.CompileMan=us.UserId + where C.ProjectId = @ProjectId"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页、排序 + /// + /// 分页下拉 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 分页索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 关闭弹出窗口 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 增加 + /// + /// 新增按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLDataEdit.aspx", "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 右键编辑 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLDataEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(sender, e); + } + #endregion + + #region 删除 + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var data = BLL.FLDataService.GetDataById(rowID); + if (data != null) + { + BLL.FLDataService.DeleteData(rowID); + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.FLDataMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + this.Grid1.EnableRowDoubleClickEvent = true; + } + else + { + this.Grid1.EnableRowDoubleClickEvent = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.designer.cs new file mode 100644 index 00000000..80326bb1 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLData.aspx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.FL { + + + public partial class HJGLData { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar ToolSearch; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx new file mode 100644 index 00000000..d13b1403 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx @@ -0,0 +1,41 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLDataEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.FL.HJGLDataEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.cs new file mode 100644 index 00000000..90012cbe --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.cs @@ -0,0 +1,83 @@ +using BLL; +using BLL.CQMS.Comprehensive; +using System; +using System.Linq; + +namespace FineUIPro.Web.HJGL.FL +{ + public partial class HJGLDataEdit : PageBase + { + #region 定义变量 + /// + /// 主键 + /// + public string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.Id = Request.Params["Id"]; + Model.HJGL_FL_Data data = BLL.FLDataService.GetDataById(this.Id); + if (data != null) + { + this.Id = data.Id; + this.txtTotalWeldQuantity.Text = data.TotalWeldQuantity; + this.txtTotalCompleted.Text = data.TotalCompleted; + this.txtTotalWeldQuantity.Text = data.TotalWeldQuantity; + this.txtOneTimeFilmAmount.Text = data.OneTimeFilmAmount; + this.txtOneTimeFilmQualifiedAmount.Text = data.OneTimeFilmQualifiedAmount; + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.HJGL_FL_Data data = new Model.HJGL_FL_Data(); + data.ProjectId = this.CurrUser.LoginProjectId; + data.TotalWeldQuantity = this.txtTotalWeldQuantity.Text.Trim(); + data.TotalCompleted = this.txtTotalCompleted.Text.Trim(); + data.OneTimeFilmAmount = this.txtOneTimeFilmAmount.Text.Trim(); + data.OneTimeFilmQualifiedAmount = this.txtOneTimeFilmQualifiedAmount.Text.Trim(); + data.CompileMan = this.CurrUser.UserId; + data.CompileDate = DateTime.Now; + if (string.IsNullOrEmpty(this.Id)) + { + data.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails)); + BLL.FLDataService.AddData(data); + } + else + { + data.Id = this.Id; + BLL.FLDataService.UpdateData(data); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs new file mode 100644 index 00000000..e4895ace --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.FL { + + + public partial class HJGLDataEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtTotalWeldQuantity 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTotalWeldQuantity; + + /// + /// txtTotalCompleted 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTotalCompleted; + + /// + /// txtOneTimeFilmAmount 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOneTimeFilmAmount; + + /// + /// txtOneTimeFilmQualifiedAmount 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOneTimeFilmQualifiedAmount; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index ec52492c..ac9902a4 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f02b6b76..b3e86f9a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -938,6 +938,9 @@ namespace Model partial void InsertHJGL_FirstOKRate(HJGL_FirstOKRate instance); partial void UpdateHJGL_FirstOKRate(HJGL_FirstOKRate instance); partial void DeleteHJGL_FirstOKRate(HJGL_FirstOKRate instance); + partial void InsertHJGL_FL_Data(HJGL_FL_Data instance); + partial void UpdateHJGL_FL_Data(HJGL_FL_Data instance); + partial void DeleteHJGL_FL_Data(HJGL_FL_Data instance); partial void InsertHJGL_FL_NdtList(HJGL_FL_NdtList instance); partial void UpdateHJGL_FL_NdtList(HJGL_FL_NdtList instance); partial void DeleteHJGL_FL_NdtList(HJGL_FL_NdtList instance); @@ -4795,6 +4798,14 @@ namespace Model } } + public System.Data.Linq.Table HJGL_FL_Data + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table HJGL_FL_NdtList { get @@ -25001,6 +25012,8 @@ namespace Model private EntitySet _HJGL_FirstOKRate; + private EntitySet _HJGL_FL_Data; + private EntitySet _HJGL_FL_NdtList; private EntitySet _HJGL_FL_OneOKRate; @@ -25533,6 +25546,7 @@ namespace Model this._HJGL_Batch_BatchTrust = new EntitySet(new Action(this.attach_HJGL_Batch_BatchTrust), new Action(this.detach_HJGL_Batch_BatchTrust)); this._HJGL_FinishRate = new EntitySet(new Action(this.attach_HJGL_FinishRate), new Action(this.detach_HJGL_FinishRate)); this._HJGL_FirstOKRate = new EntitySet(new Action(this.attach_HJGL_FirstOKRate), new Action(this.detach_HJGL_FirstOKRate)); + this._HJGL_FL_Data = new EntitySet(new Action(this.attach_HJGL_FL_Data), new Action(this.detach_HJGL_FL_Data)); this._HJGL_FL_NdtList = new EntitySet(new Action(this.attach_HJGL_FL_NdtList), new Action(this.detach_HJGL_FL_NdtList)); this._HJGL_FL_OneOKRate = new EntitySet(new Action(this.attach_HJGL_FL_OneOKRate), new Action(this.detach_HJGL_FL_OneOKRate)); this._HJGL_FL_PressurePackageList = new EntitySet(new Action(this.attach_HJGL_FL_PressurePackageList), new Action(this.detach_HJGL_FL_PressurePackageList)); @@ -28057,6 +28071,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FL_Data_Base_Project", Storage="_HJGL_FL_Data", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet HJGL_FL_Data + { + get + { + return this._HJGL_FL_Data; + } + set + { + this._HJGL_FL_Data.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FL_NdtList_Base_Project", Storage="_HJGL_FL_NdtList", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet HJGL_FL_NdtList { @@ -31662,6 +31689,18 @@ namespace Model entity.Base_Project = null; } + private void attach_HJGL_FL_Data(HJGL_FL_Data entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_HJGL_FL_Data(HJGL_FL_Data entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_HJGL_FL_NdtList(HJGL_FL_NdtList entity) { this.SendPropertyChanging(); @@ -149173,6 +149212,318 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_FL_Data")] + public partial class HJGL_FL_Data : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _TotalWeldQuantity; + + private string _TotalCompleted; + + private string _OneTimeFilmAmount; + + private string _OneTimeFilmQualifiedAmount; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTotalWeldQuantityChanging(string value); + partial void OnTotalWeldQuantityChanged(); + partial void OnTotalCompletedChanging(string value); + partial void OnTotalCompletedChanged(); + partial void OnOneTimeFilmAmountChanging(string value); + partial void OnOneTimeFilmAmountChanged(); + partial void OnOneTimeFilmQualifiedAmountChanging(string value); + partial void OnOneTimeFilmQualifiedAmountChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public HJGL_FL_Data() + { + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [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="_TotalWeldQuantity", DbType="NVarChar(50)")] + public string TotalWeldQuantity + { + get + { + return this._TotalWeldQuantity; + } + set + { + if ((this._TotalWeldQuantity != value)) + { + this.OnTotalWeldQuantityChanging(value); + this.SendPropertyChanging(); + this._TotalWeldQuantity = value; + this.SendPropertyChanged("TotalWeldQuantity"); + this.OnTotalWeldQuantityChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalCompleted", DbType="NVarChar(50)")] + public string TotalCompleted + { + get + { + return this._TotalCompleted; + } + set + { + if ((this._TotalCompleted != value)) + { + this.OnTotalCompletedChanging(value); + this.SendPropertyChanging(); + this._TotalCompleted = value; + this.SendPropertyChanged("TotalCompleted"); + this.OnTotalCompletedChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OneTimeFilmAmount", DbType="NVarChar(50)")] + public string OneTimeFilmAmount + { + get + { + return this._OneTimeFilmAmount; + } + set + { + if ((this._OneTimeFilmAmount != value)) + { + this.OnOneTimeFilmAmountChanging(value); + this.SendPropertyChanging(); + this._OneTimeFilmAmount = value; + this.SendPropertyChanged("OneTimeFilmAmount"); + this.OnOneTimeFilmAmountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OneTimeFilmQualifiedAmount", DbType="NVarChar(50)")] + public string OneTimeFilmQualifiedAmount + { + get + { + return this._OneTimeFilmQualifiedAmount; + } + set + { + if ((this._OneTimeFilmQualifiedAmount != value)) + { + this.OnOneTimeFilmQualifiedAmountChanging(value); + this.SendPropertyChanging(); + this._OneTimeFilmQualifiedAmount = value; + this.SendPropertyChanged("OneTimeFilmQualifiedAmount"); + this.OnOneTimeFilmQualifiedAmountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FL_Data_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.HJGL_FL_Data.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.HJGL_FL_Data.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FL_Data_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.HJGL_FL_Data.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.HJGL_FL_Data.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + 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.HJGL_FL_NdtList")] public partial class HJGL_FL_NdtList : INotifyPropertyChanging, INotifyPropertyChanged { @@ -318889,6 +319240,8 @@ namespace Model private EntitySet _Hazard_HazardList_Sys_User1; + private EntitySet _HJGL_FL_Data; + private EntitySet _InApproveManager_EquipmentIn; private EntitySet _InApproveManager_EquipmentOut; @@ -319552,6 +319905,7 @@ namespace Model this._Hazard_EnvironmentalRiskList_Sys_User1 = new EntitySet(new Action(this.attach_Hazard_EnvironmentalRiskList_Sys_User1), new Action(this.detach_Hazard_EnvironmentalRiskList_Sys_User1)); this._Hazard_HazardList = new EntitySet(new Action(this.attach_Hazard_HazardList), new Action(this.detach_Hazard_HazardList)); this._Hazard_HazardList_Sys_User1 = new EntitySet(new Action(this.attach_Hazard_HazardList_Sys_User1), new Action(this.detach_Hazard_HazardList_Sys_User1)); + this._HJGL_FL_Data = new EntitySet(new Action(this.attach_HJGL_FL_Data), new Action(this.detach_HJGL_FL_Data)); this._InApproveManager_EquipmentIn = new EntitySet(new Action(this.attach_InApproveManager_EquipmentIn), new Action(this.detach_InApproveManager_EquipmentIn)); this._InApproveManager_EquipmentOut = new EntitySet(new Action(this.attach_InApproveManager_EquipmentOut), new Action(this.detach_InApproveManager_EquipmentOut)); this._InApproveManager_EquipmentQualityIn = new EntitySet(new Action(this.attach_InApproveManager_EquipmentQualityIn), new Action(this.detach_InApproveManager_EquipmentQualityIn)); @@ -322305,6 +322659,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FL_Data_Sys_User", Storage="_HJGL_FL_Data", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet HJGL_FL_Data + { + get + { + return this._HJGL_FL_Data; + } + set + { + this._HJGL_FL_Data.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InApproveManager_EquipmentIn_Sys_User", Storage="_InApproveManager_EquipmentIn", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet InApproveManager_EquipmentIn { @@ -326636,6 +327003,18 @@ namespace Model entity.ControllingPersonSys_User = null; } + private void attach_HJGL_FL_Data(HJGL_FL_Data entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_HJGL_FL_Data(HJGL_FL_Data entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_InApproveManager_EquipmentIn(InApproveManager_EquipmentIn entity) { this.SendPropertyChanging();