From c63ba7b8e950cc42d192b9375bea6335cfa6eb89 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 29 May 2026 09:30:42 +0800 Subject: [PATCH 1/2] 1 --- DataBase/版本日志/SGGLDB_V2026-05-28-gf.sql | 6 + SGGL/Model/Model.cs | 122 +++++++++++++++++++- 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-05-28-gf.sql diff --git a/DataBase/版本日志/SGGLDB_V2026-05-28-gf.sql b/DataBase/版本日志/SGGLDB_V2026-05-28-gf.sql new file mode 100644 index 00000000..2c05a6d7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-28-gf.sql @@ -0,0 +1,6 @@ +Alter TABLE [dbo].HJGL_WeldJoint add + [AttachSourceId] [nvarchar](50) NULL, + [x] [nvarchar](50) NULL, + [y] [nvarchar](50) NULL, + [x2] [nvarchar](50) NULL, + [y2] [nvarchar] (50) NULL \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a757b5cc..c782acab 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -108926,6 +108926,16 @@ namespace Model private string _WeldJointPoint; + private string _AttachSourceId; + + private string _X; + + private string _Y; + + private string _X2; + + private string _Y2; + private EntitySet _HJGL_Batch_BatchTrustItem; private EntitySet _HJGL_Batch_PointBatchItem; @@ -109074,6 +109084,16 @@ namespace Model partial void OnCoverWelderTeamGroupIdChanged(); partial void OnWeldJointPointChanging(string value); partial void OnWeldJointPointChanged(); + partial void OnAttachSourceIdChanging(string value); + partial void OnAttachSourceIdChanged(); + partial void OnXChanging(string value); + partial void OnXChanged(); + partial void OnYChanging(string value); + partial void OnYChanged(); + partial void OnX2Changing(string value); + partial void OnX2Changed(); + partial void OnY2Changing(string value); + partial void OnY2Changed(); #endregion public HJGL_WeldJoint() @@ -110163,6 +110183,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachSourceId", DbType="NVarChar(50)")] + public string AttachSourceId + { + get + { + return this._AttachSourceId; + } + set + { + if ((this._AttachSourceId != value)) + { + this.OnAttachSourceIdChanging(value); + this.SendPropertyChanging(); + this._AttachSourceId = value; + this.SendPropertyChanged("AttachSourceId"); + this.OnAttachSourceIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="x", Storage="_X", DbType="NVarChar(50)")] + public string X + { + get + { + return this._X; + } + set + { + if ((this._X != value)) + { + this.OnXChanging(value); + this.SendPropertyChanging(); + this._X = value; + this.SendPropertyChanged("X"); + this.OnXChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y", Storage="_Y", DbType="NVarChar(50)")] + public string Y + { + get + { + return this._Y; + } + set + { + if ((this._Y != value)) + { + this.OnYChanging(value); + this.SendPropertyChanging(); + this._Y = value; + this.SendPropertyChanged("Y"); + this.OnYChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="x2", Storage="_X2", DbType="NVarChar(50)")] + public string X2 + { + get + { + return this._X2; + } + set + { + if ((this._X2 != value)) + { + this.OnX2Changing(value); + this.SendPropertyChanging(); + this._X2 = value; + this.SendPropertyChanged("X2"); + this.OnX2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y2", Storage="_Y2", DbType="NVarChar(50)")] + public string Y2 + { + get + { + return this._Y2; + } + set + { + if ((this._Y2 != value)) + { + this.OnY2Changing(value); + this.SendPropertyChanging(); + this._Y2 = value; + this.SendPropertyChanged("Y2"); + this.OnY2Changed(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet HJGL_Batch_BatchTrustItem { @@ -275753,7 +275873,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(300)")] public string MaterialCode { get From 2864f34fb81e565a4df0870e7f2f82f9f918524f Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 29 May 2026 09:35:09 +0800 Subject: [PATCH 2/2] 1 --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index df5494f8..33bc6655 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17166,7 +17166,7 @@ - +