diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 48678126..2a295016 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -40,6 +40,7 @@ 3 AnyCPU false + 7.2 pdbonly @@ -1555,6 +1556,9 @@ + + + @@ -13549,6 +13553,27 @@ CompanySpecialMeetingView.aspx + + ActionPlanList.aspx + ASPXCodeBehind + + + ActionPlanList.aspx + + + ActionPlanListEdit.aspx + ASPXCodeBehind + + + ActionPlanListEdit.aspx + + + ActionPlanListView.aspx + ASPXCodeBehind + + + ActionPlanListView.aspx + MainPlan.aspx ASPXCodeBehind diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a4bf2b60..b2743e99 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -59406,11 +59406,11 @@ namespace Model private string _CostTypeName; - private string _SupCostTypeName; + private System.Nullable _SortIndex; private string _SupCostTypeId; - private System.Nullable _SortIndex; + private string _SupCostTypeName; private System.Nullable _SupSortIndex; @@ -59432,12 +59432,12 @@ namespace Model partial void OnCostDefChanged(); partial void OnCostTypeNameChanging(string value); partial void OnCostTypeNameChanged(); - partial void OnSupCostTypeNameChanging(string value); - partial void OnSupCostTypeNameChanged(); - partial void OnSupCostTypeIdChanging(string value); - partial void OnSupCostTypeIdChanged(); partial void OnSortIndexChanging(System.Nullable value); partial void OnSortIndexChanged(); + partial void OnSupCostTypeIdChanging(string value); + partial void OnSupCostTypeIdChanged(); + partial void OnSupCostTypeNameChanging(string value); + partial void OnSupCostTypeNameChanged(); partial void OnSupSortIndexChanging(System.Nullable value); partial void OnSupSortIndexChanged(); #endregion @@ -59572,22 +59572,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeName", DbType="NVarChar(50)")] - public string SupCostTypeName + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex { get { - return this._SupCostTypeName; + return this._SortIndex; } set { - if ((this._SupCostTypeName != value)) + if ((this._SortIndex != value)) { - this.OnSupCostTypeNameChanging(value); + this.OnSortIndexChanging(value); this.SendPropertyChanging(); - this._SupCostTypeName = value; - this.SendPropertyChanged("SupCostTypeName"); - this.OnSupCostTypeNameChanged(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); } } } @@ -59612,22 +59612,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] - public System.Nullable SortIndex + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeName", DbType="NVarChar(50)")] + public string SupCostTypeName { get { - return this._SortIndex; + return this._SupCostTypeName; } set { - if ((this._SortIndex != value)) + if ((this._SupCostTypeName != value)) { - this.OnSortIndexChanging(value); + this.OnSupCostTypeNameChanging(value); this.SendPropertyChanging(); - this._SortIndex = value; - this.SendPropertyChanged("SortIndex"); - this.OnSortIndexChanged(); + this._SupCostTypeName = value; + this.SendPropertyChanged("SupCostTypeName"); + this.OnSupCostTypeNameChanged(); } } } @@ -172702,7 +172702,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(2000)")] public string Remarks { get @@ -173322,7 +173322,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="VarChar(50)")] public string PriceMethod { get @@ -173462,7 +173462,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(2000)")] public string Clause { get @@ -262052,6 +262052,8 @@ namespace Model private string _DNDia; + private System.Nullable _Size; + private System.Nullable _Thickness; private string _Remark; @@ -262200,6 +262202,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Size", DbType="Decimal(8,3)")] + public System.Nullable Size + { + get + { + return this._Size; + } + set + { + if ((this._Size != value)) + { + this._Size = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Thickness", DbType="Decimal(8,3)")] public System.Nullable Thickness {