diff --git a/DataBase/版本日志/SGGLDB_V2023-10-23.sql b/DataBase/版本日志/SGGLDB_V2023-10-23.sql new file mode 100644 index 00000000..a3d0eae6 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-23.sql @@ -0,0 +1,42 @@ +ALTER VIEW [dbo].[View_Solution_LargerHazardListItem] + AS +/*Σ󹤳嵥ϸбͼ*/ +SELECT Project.ProjectCode + ,ISNULL(Project.ShortName,Project.ProjectName) AS ProjectName + ,Project.ProjectId + ,list.HazardCode + ,list.RecordTime + ,list.RecardManId + ,list.Remark + ,list.States + ,list.VersionNo + ,Item.LargerHazardListItemId + ,Item.SortIndex + ,Item.LargerHazardListId + ,Item.UnitWorkId + ,(UnitWork.UnitWorkName+'('+(CASE WHEN UnitWork.ProjectType='1' THEN '' ELSE 'װ' END)+')') AS UnitWorkName + ,Item.WorkPackageId + ,Type.SpecialSchemeTypeName + ,WorkPackageName AS PackageContent + ,Item.WorkPackageSize + ,Item.ExpectedStartTime + ,Item.ExpectedEndTime + ,Item.IsArgument + ,(CASE WHEN Item.IsArgument=1 THEN '' ELSE '' END) AS IsArgumentName + ,Item.WorkStates + ,constw.ConstText AS WorkStatesName + ,Item.UnitId + ,Unit.UnitName + ,((CASE WHEN Item.ExpectedStartTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedStartTime,23) END) + + ''+ (CASE WHEN Item.ExpectedEndTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedEndTime,23) END)) AS ExpectedTime +FROM dbo.Solution_LargerHazardListItem AS Item +LEFT JOIN Solution_LargerHazardList AS list ON Item.LargerHazardListId=list.LargerHazardListId +LEFT JOIN Base_Project AS Project ON Project.ProjectId=list.ProjectId +LEFT JOIN WBS_UnitWork AS UnitWork ON Item.UnitWorkId=UnitWork.UnitWorkId +LEFT JOIN Base_SpecialSchemeType AS Type ON Item.WorkPackageId=Type.SpecialSchemeTypeId +LEFT JOIN Base_Unit AS Unit ON Item.UnitId=Unit.UnitId +LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.GroupId='WorkStates' + +GO + + diff --git a/SGGL/BLL/API/APIGetHttpService.cs b/SGGL/BLL/API/APIGetHttpService.cs index 7f33af2b..63e8e9ac 100644 --- a/SGGL/BLL/API/APIGetHttpService.cs +++ b/SGGL/BLL/API/APIGetHttpService.cs @@ -18,6 +18,8 @@ namespace BLL /// public static string Http(string url, string method = "GET", string contenttype = "application/json;charset=utf-8", Hashtable header = null, string data = null) { + ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 ; + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); request.Method = string.IsNullOrEmpty(method) ? "GET" : method; request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype; diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx index 68611f2a..1db51adf 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx @@ -85,7 +85,7 @@ diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx index ee5f0053..b1c3c52f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx @@ -37,7 +37,7 @@ - + + FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center"> - + @@ -96,8 +96,8 @@ - + <%-- - + --%> - <%-- - --%> + @@ -80,10 +80,10 @@ - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs index 25f76274..ab5aa913 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution //单位工程 BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); //分部分项 - // BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true); + BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true); //是否需要专家论证 BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False"); //作业状态 @@ -70,14 +70,14 @@ namespace FineUIPro.Web.HSSE.Solution { this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId; } - //if (!string.IsNullOrEmpty(getItem.WorkPackageId)) - //{ - // this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId; - //} + if (!string.IsNullOrEmpty(getItem.WorkPackageId)) + { + this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId; + } this.txtWorkPackageSize.Text = getItem.WorkPackageSize; - this.hdWorkPackageId.Text = getItem.WorkPackageId; - this.txtWorkPackageId.Text = getItem.PackageContent; + //this.hdWorkPackageId.Text = getItem.WorkPackageId; + //this.txtWorkPackageId.Text = getItem.PackageContent; this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime); this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime); @@ -125,13 +125,13 @@ namespace FineUIPro.Web.HSSE.Solution ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text), IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), WorkStates = this.rbWorkStates.SelectedValue ?? "1", - WorkPackageId = this.hdWorkPackageId.Text, - WorkPackageName = this.txtWorkPackageId.Text, + //WorkPackageId = this.hdWorkPackageId.Text, + //WorkPackageName = this.txtWorkPackageId.Text, }; - //if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue)) - //{ - // newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue; - //} + if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue)) + { + newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue; + } if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue)) { newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue; @@ -157,20 +157,20 @@ namespace FineUIPro.Web.HSSE.Solution } #endregion - protected void btSearch_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID) - + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - "))); - } + //protected void btSearch_Click(object sender, EventArgs e) + //{ + // PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID) + // + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - "))); + //} - protected void Window1_Close(object sender, WindowCloseEventArgs e) - { - var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&'); - if (getReturnValues.Count() > 1) - { - this.hdWorkPackageId.Text = getReturnValues[0].ToString(); - this.txtWorkPackageId.Text = getReturnValues[1].ToString(); - } - } + //protected void Window1_Close(object sender, WindowCloseEventArgs e) + //{ + // var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&'); + // if (getReturnValues.Count() > 1) + // { + // this.hdWorkPackageId.Text = getReturnValues[0].ToString(); + // this.txtWorkPackageId.Text = getReturnValues[1].ToString(); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs index 0563fd70..876b38d8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs @@ -60,31 +60,13 @@ namespace FineUIPro.Web.HSSE.Solution protected global::FineUIPro.DropDownList drpUnitWorkId; /// - /// txtWorkPackageId 控件。 + /// drpWorkPackageId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label txtWorkPackageId; - - /// - /// hdWorkPackageId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox hdWorkPackageId; - - /// - /// btSearch 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btSearch; + protected global::FineUIPro.DropDownList drpWorkPackageId; /// /// txtWorkPackageSize 控件。 @@ -184,14 +166,5 @@ namespace FineUIPro.Web.HSSE.Solution /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - - /// - /// Window1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window1; } } diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx index 85def3e2..d38bc12a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx @@ -35,28 +35,28 @@ + Height="600px" EnableColumnLines="true"> - - - + + FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center"> - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5afc0887..5d5236b3 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -39516,10 +39516,10 @@ namespace Model private string _SaveHandleMan; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39576,10 +39576,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_CheckControl() @@ -40058,26 +40058,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -40098,6 +40078,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100765,10 +100765,10 @@ namespace Model private string _HazardValue; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100869,10 +100869,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101810,26 +101810,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -101850,6 +101830,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -289081,6 +289081,8 @@ namespace Model private string _WorkPackageId; + private string _SpecialSchemeTypeName; + private string _PackageContent; private string _WorkPackageSize; @@ -289347,6 +289349,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialSchemeTypeName", DbType="NVarChar(500)")] + public string SpecialSchemeTypeName + { + get + { + return this._SpecialSchemeTypeName; + } + set + { + if ((this._SpecialSchemeTypeName != value)) + { + this._SpecialSchemeTypeName = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(2000)")] public string PackageContent {