Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

DataBase/版本日志/SGGLDB_WH_V2024-07-30-phf.sql

@@ -1,5 +1,5 @@
 alter table Transfer_LHCSystemList add  UpdateTime datetime NULL
-GO;
+GO
 update Transfer_PunchlistFrom set IsMatI='Y' where IsMatI='1'
 GO
 update Transfer_PunchlistFrom set IsMatI='N' where IsMatI='0'

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

SGGL/Model/Model.cs

@@ -62049,6 +62049,8 @@ namespace Model
 		
 		private EntityRef<Base_Project> _Base_Project;
 		
+		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -62100,6 +62102,7 @@ namespace Model
 		public Check_CheckSpecial()
 		{
 			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
 			OnCreated();
 		}
 		
@@ -62418,6 +62421,10 @@ namespace Model
 			{
 				if ((this._CheckItemSetId != value))
 				{
+					if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
 					this.OnCheckItemSetIdChanging(value);
 					this.SendPropertyChanging();
 					this._CheckItemSetId = value;
@@ -62561,6 +62568,40 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
+		public Technique_CheckItemSet Technique_CheckItemSet
+		{
+			get
+			{
+				return this._Technique_CheckItemSet.Entity;
+			}
+			set
+			{
+				Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
+				if (((previousValue != value) 
+							|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Technique_CheckItemSet.Entity = null;
+						previousValue.Check_CheckSpecial.Remove(this);
+					}
+					this._Technique_CheckItemSet.Entity = value;
+					if ((value != null))
+					{
+						value.Check_CheckSpecial.Add(this);
+						this._CheckItemSetId = value.CheckItemSetId;
+					}
+					else
+					{
+						this._CheckItemSetId = default(string);
+					}
+					this.SendPropertyChanged("Technique_CheckItemSet");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -370521,6 +370562,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsBuiltIn;
 		
+		private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
+		
 		private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
 		
     #region 可扩展性方法定义
@@ -370547,6 +370590,7 @@ namespace Model
 		
 		public Technique_CheckItemSet()
 		{
+			this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
 			this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
 			OnCreated();
 		}
@@ -370711,6 +370755,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
+		public EntitySet<Check_CheckSpecial> Check_CheckSpecial
+		{
+			get
+			{
+				return this._Check_CheckSpecial;
+			}
+			set
+			{
+				this._Check_CheckSpecial.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
 		public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
 		{
@@ -370744,6 +370801,18 @@ namespace Model
 			}
 		}
 		
+		private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
+		{
+			this.SendPropertyChanging();
+			entity.Technique_CheckItemSet = this;
+		}
+		
+		private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
+		{
+			this.SendPropertyChanging();
+			entity.Technique_CheckItemSet = null;
+		}
+		
 		private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
 		{
 			this.SendPropertyChanging();
@@ -394353,8 +394422,12 @@ namespace Model
 		
 		private string _Comments;
 		
+		private string _Num_NO;
+		
 		private string _System_No;
 		
+		private string _Sub_Sys_No;
+		
 		private string _Cat;
 		
 		private string _Raised_By;
@@ -394375,6 +394448,8 @@ namespace Model
 		
 		private string _PIC_WUH;
 		
+		private string _Correction_Action;
+		
 		private System.Nullable<System.DateTime> _Actual_Date;
 		
 		private string _Cleared_By;
@@ -394393,12 +394468,6 @@ namespace Model
 		
 		private string _Remark;
 		
-		private string _Sub_Sys_No;
-		
-		private string _Num_NO;
-		
-		private string _Correction_Action;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -394435,8 +394504,12 @@ namespace Model
     partial void OnPUNCH_ITEM_STATUSChanged();
     partial void OnCommentsChanging(string value);
     partial void OnCommentsChanged();
+    partial void OnNum_NOChanging(string value);
+    partial void OnNum_NOChanged();
     partial void OnSystem_NoChanging(string value);
     partial void OnSystem_NoChanged();
+    partial void OnSub_Sys_NoChanging(string value);
+    partial void OnSub_Sys_NoChanged();
     partial void OnCatChanging(string value);
     partial void OnCatChanged();
     partial void OnRaised_ByChanging(string value);
@@ -394457,6 +394530,8 @@ namespace Model
     partial void OnPICChanged();
     partial void OnPIC_WUHChanging(string value);
     partial void OnPIC_WUHChanged();
+    partial void OnCorrection_ActionChanging(string value);
+    partial void OnCorrection_ActionChanged();
     partial void OnActual_DateChanging(System.Nullable<System.DateTime> value);
     partial void OnActual_DateChanged();
     partial void OnCleared_ByChanging(string value);
@@ -394475,12 +394550,6 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
-    partial void OnSub_Sys_NoChanging(string value);
-    partial void OnSub_Sys_NoChanged();
-    partial void OnNum_NOChanging(string value);
-    partial void OnNum_NOChanged();
-    partial void OnCorrection_ActionChanging(string value);
-    partial void OnCorrection_ActionChanged();
     #endregion
 		
 		public Transfer_PunchlistFrom()
@@ -394808,6 +394877,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
+		public string Num_NO
+		{
+			get
+			{
+				return this._Num_NO;
+			}
+			set
+			{
+				if ((this._Num_NO != value))
+				{
+					this.OnNum_NOChanging(value);
+					this.SendPropertyChanging();
+					this._Num_NO = value;
+					this.SendPropertyChanged("Num_NO");
+					this.OnNum_NOChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")]
 		public string System_No
 		{
@@ -394828,6 +394917,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
+		public string Sub_Sys_No
+		{
+			get
+			{
+				return this._Sub_Sys_No;
+			}
+			set
+			{
+				if ((this._Sub_Sys_No != value))
+				{
+					this.OnSub_Sys_NoChanging(value);
+					this.SendPropertyChanging();
+					this._Sub_Sys_No = value;
+					this.SendPropertyChanged("Sub_Sys_No");
+					this.OnSub_Sys_NoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")]
 		public string Cat
 		{
@@ -395028,6 +395137,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
+		public string Correction_Action
+		{
+			get
+			{
+				return this._Correction_Action;
+			}
+			set
+			{
+				if ((this._Correction_Action != value))
+				{
+					this.OnCorrection_ActionChanging(value);
+					this.SendPropertyChanging();
+					this._Correction_Action = value;
+					this.SendPropertyChanged("Correction_Action");
+					this.OnCorrection_ActionChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")]
 		public System.Nullable<System.DateTime> Actual_Date
 		{
@@ -395208,66 +395337,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
-		public string Sub_Sys_No
-		{
-			get
-			{
-				return this._Sub_Sys_No;
-			}
-			set
-			{
-				if ((this._Sub_Sys_No != value))
-				{
-					this.OnSub_Sys_NoChanging(value);
-					this.SendPropertyChanging();
-					this._Sub_Sys_No = value;
-					this.SendPropertyChanged("Sub_Sys_No");
-					this.OnSub_Sys_NoChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
-		public string Num_NO
-		{
-			get
-			{
-				return this._Num_NO;
-			}
-			set
-			{
-				if ((this._Num_NO != value))
-				{
-					this.OnNum_NOChanging(value);
-					this.SendPropertyChanging();
-					this._Num_NO = value;
-					this.SendPropertyChanged("Num_NO");
-					this.OnNum_NOChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
-		public string Correction_Action
-		{
-			get
-			{
-				return this._Correction_Action;
-			}
-			set
-			{
-				if ((this._Correction_Action != value))
-				{
-					this.OnCorrection_ActionChanging(value);
-					this.SendPropertyChanging();
-					this._Correction_Action = value;
-					this.SendPropertyChanged("Correction_Action");
-					this.OnCorrection_ActionChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;