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

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/FineUIPro.Web/Web.config

@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

SGGL/Model/Model.cs

@@ -121441,12 +121441,12 @@ namespace Model
 		
 		private string _MeetingCode;
 		
-		private string _States;
-		
 		private string _CompileMan;
 		
 		private System.Nullable<System.DateTime> _CompileDate;
 		
+		private string _States;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@@ -121483,12 +121483,12 @@ namespace Model
     partial void OnRemarkChanged();
     partial void OnMeetingCodeChanging(string value);
     partial void OnMeetingCodeChanged();
-    partial void OnStatesChanging(string value);
-    partial void OnStatesChanged();
     partial void OnCompileManChanging(string value);
     partial void OnCompileManChanged();
     partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
     partial void OnCompileDateChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
     #endregion
 		
 		public Driver_Meeting()
@@ -121767,26 +121767,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
-		public string States
-		{
-			get
-			{
-				return this._States;
-			}
-			set
-			{
-				if ((this._States != value))
-				{
-					this.OnStatesChanging(value);
-					this.SendPropertyChanging();
-					this._States = value;
-					this.SendPropertyChanged("States");
-					this.OnStatesChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
 		public string CompileMan
 		{
@@ -121827,6 +121807,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_Meeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -306122,6 +306122,8 @@ namespace Model
 		
 		private string _WorkPackId;
 		
+		private string _LevelName;
+		
 		private string _ProjectId;
 		
 		private System.Nullable<int> _States;
@@ -306148,6 +306150,8 @@ namespace Model
     partial void OnScheduleIdChanged();
     partial void OnWorkPackIdChanging(string value);
     partial void OnWorkPackIdChanged();
+    partial void OnLevelNameChanging(string value);
+    partial void OnLevelNameChanged();
     partial void OnProjectIdChanging(string value);
     partial void OnProjectIdChanged();
     partial void OnStatesChanging(System.Nullable<int> value);
@@ -306193,7 +306197,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackId", DbType="VarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackId", DbType="VarChar(50)")]
 		public string WorkPackId
 		{
 			get
@@ -306213,6 +306217,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LevelName", DbType="VarChar(50)")]
+		public string LevelName
+		{
+			get
+			{
+				return this._LevelName;
+			}
+			set
+			{
+				if ((this._LevelName != value))
+				{
+					this.OnLevelNameChanging(value);
+					this.SendPropertyChanging();
+					this._LevelName = value;
+					this.SendPropertyChanged("LevelName");
+					this.OnLevelNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")]
 		public string ProjectId
 		{

SGGL/WebAPI/WebAPI.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 />
     <IISExpressSSLPort />