diff --git a/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql
new file mode 100644
index 00000000..f137dc19
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql
@@ -0,0 +1,13 @@
+
+
+
+
+--PMPϵͳݲֶ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'stProjectStepName')
+BEGIN
+ ALTER TABLE PMP_Project ADD stProjectTypeName nvarchar(200);
+ ALTER TABLE PMP_Project ADD stProjectStepName nvarchar(200);
+END
+GO
+
+
diff --git a/SGGL/BLL/PMP/PMPDataService.cs b/SGGL/BLL/PMP/PMPDataService.cs
index 05366aae..6f69b173 100644
--- a/SGGL/BLL/PMP/PMPDataService.cs
+++ b/SGGL/BLL/PMP/PMPDataService.cs
@@ -160,6 +160,8 @@ namespace BLL
newItem.ProjStepZxnoName = item.projStepZxnoName;
newItem.StProjectTypeVals = item.stProjectTypeVals;
newItem.StProjectStepVals = item.stProjectStepVals;
+ newItem.StProjectStepName = item.stProjectStepName;
+ newItem.StProjectTypeName = item.stProjectTypeName;
newItem.ProjStepZxnoVals = item.projStepZxnoVals;
newItem.StProjectPropertyVals = item.stProjectPropertyVals;
newItem.RemarkA = item.remarkA;
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
index e5e691d7..632abdb2 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
@@ -55,9 +55,10 @@
-
+ <%----%>
-
+
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 7ad8004d..6d65ee2e 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -297770,6 +297770,10 @@ namespace Model
private string _StLocationName;
+ private string _StProjectStepName;
+
+ private string _StProjectTypeName;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -297842,6 +297846,10 @@ namespace Model
partial void OnPlanEndDateChanged();
partial void OnStLocationNameChanging(string value);
partial void OnStLocationNameChanged();
+ partial void OnStProjectStepNameChanging(string value);
+ partial void OnStProjectStepNameChanged();
+ partial void OnStProjectTypeNameChanging(string value);
+ partial void OnStProjectTypeNameChanged();
#endregion
public PMP_Project()
@@ -298529,6 +298537,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectStepName", Storage="_StProjectStepName", DbType="NVarChar(200)")]
+ public string StProjectStepName
+ {
+ get
+ {
+ return this._StProjectStepName;
+ }
+ set
+ {
+ if ((this._StProjectStepName != value))
+ {
+ this.OnStProjectStepNameChanging(value);
+ this.SendPropertyChanging();
+ this._StProjectStepName = value;
+ this.SendPropertyChanged("StProjectStepName");
+ this.OnStProjectStepNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectTypeName", Storage="_StProjectTypeName", DbType="NVarChar(200)")]
+ public string StProjectTypeName
+ {
+ get
+ {
+ return this._StProjectTypeName;
+ }
+ set
+ {
+ if ((this._StProjectTypeName != value))
+ {
+ this.OnStProjectTypeNameChanging(value);
+ this.SendPropertyChanging();
+ this._StProjectTypeName = value;
+ this.SendPropertyChanged("StProjectTypeName");
+ this.OnStProjectTypeNameChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/SGGL/Model/PMP/PMPProject.cs b/SGGL/Model/PMP/PMPProject.cs
index fb8e64d6..5f333b30 100644
--- a/SGGL/Model/PMP/PMPProject.cs
+++ b/SGGL/Model/PMP/PMPProject.cs
@@ -173,10 +173,20 @@ namespace Model
[JsonProperty("stProjectTypeVals")]
public string stProjectTypeVals { get; set; }
///
+ /// 项目类型一级名称
+ ///
+ [JsonProperty("stProjectTypeName")]
+ public string stProjectTypeName { get; set; }
+ ///
/// 项目类型二级
///
[JsonProperty("stProjectStepVals")]
public string stProjectStepVals { get; set; }
+ ///
+ /// 项目类型二级名称
+ ///
+ [JsonProperty("stProjectStepName")]
+ public string stProjectStepName { get; set; }
/////
///// 项目阶段名称【控制软件项目阶段】
/////