xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:升级

Browse Source
This commit is contained in:
geh
2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+18 -2
View File
@@ -534,7 +534,23 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
//if (hazardRegister.States == Const.State_3 || this.CurrUser.UserId == BLL.Const.hfnbdId) //待整改
//{
BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
if (hazardRegister.IsUpdate == true) //已上传集团记录，需要先删除集团记录后才可以删除本地记录
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectHazardRegisterData(rowID);
if (returndata.code == 1)
{
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
}
//}
//else
//{
@@ -542,7 +558,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
// return;
//}
}
// Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
BindGrid();
ShowNotify("删除成功!", MessageBoxIcon.Success);
}
SUBQHSE/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+19 -2
View File
@@ -288,8 +288,25 @@ namespace FineUIPro.Web.HSSE.License
var licenseManager = BLL.LicenseManagerService.GetLicenseManagerById(rowID);
if (licenseManager != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
if (licenseManager.IsUpdate == true)
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectLicenseData(rowID);
if (returndata.code == 1)
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
}
}
}
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkPermit);
SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs
+19 -2
View File
@@ -242,8 +242,25 @@ namespace FineUIPro.Web.HSSE.Solution
var getV = BLL.LargerHazardService.GetLargerHazardByHazardId(rowID);
if (getV != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
if (getV.IsUpdate == true)
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectLargeEngineeringData(rowID);
if (returndata.code == 1)
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
}
}
}
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
SUBQHSE/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs
+3 -3
View File
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.HSSE.Technique
/// <param name="menuId"></param>
private void BoundTree(TreeNodeCollection nodes, string menuId)
{
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId);
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId, "0");
if (dt.Count() > 0)
{
TreeNode tn = null;
@@ -388,7 +388,7 @@ namespace FineUIPro.Web.HSSE.Technique
BindGrid();
}
#endregion
#region 导出
/// <summary>
/// 关闭导出窗口
@@ -549,7 +549,7 @@ namespace FineUIPro.Web.HSSE.Technique
{
this.btnDelete.Hidden = false;
this.btnMenuDelete.Hidden = false;
}
}
if (buttonList.Contains(BLL.Const.BtnOut))
{
this.btnSelectColumns.Hidden = false;
SUBQHSE/FineUIPro.Web/HSSE/Technique/Rectify.aspx.designer.cs
Generated
+135 -133
View File
@@ -1,293 +1,295 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
// <auto-generated>
// This code was generated by a tool.
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Technique {
public partial class Rectify {
namespace FineUIPro.Web.HSSE.Technique
{
public partial class Rectify
{
/// <summary>
/// form1 控件。
/// form1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// PageManager1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// Panel1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// panelLeftRegion control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar2 控件。
/// Toolbar2 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnNew 控件。
/// btnNew control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnEdit 控件。
/// btnEdit control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnEdit;
/// <summary>
/// btnDelete 控件。
/// btnDelete control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// trRectify 控件。
/// trRectify control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Tree trRectify;
/// <summary>
/// panelCenterRegion 控件。
/// panelCenterRegion control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// Grid1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// Toolbar3 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// RectifyName 控件。
/// RectifyName control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox RectifyName;
/// <summary>
/// HazardSourcePoint 控件。
/// HazardSourcePoint control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox HazardSourcePoint;
/// <summary>
/// btnQuery 控件。
/// btnQuery control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnNewDetail 控件。
/// btnNewDetail control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnNewDetail;
/// <summary>
/// btnSelectColumns 控件。
/// btnSelectColumns control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnSelectColumns;
/// <summary>
/// lblRectifyName 控件。
/// lblRectifyName control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblRectifyName;
/// <summary>
/// Label5 控件。
/// Label5 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// Label4 控件。
/// Label4 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// Label2 控件。
/// Label2 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// Label3 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// ToolbarSeparator1 控件。
/// ToolbarSeparator1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// ToolbarText1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// ddlPageSize control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// Window1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// Window2 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window5 控件。
/// Window5 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Window Window5;
/// <summary>
/// Menu1 控件。
/// Menu1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// btnMenuEdit control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// btnMenuDelete control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
SUBQHSE/FineUIPro.Web/HSSE/Technique/RectifyEdit.aspx.cs
+1
View File
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.HSSE.Technique
{
Model.Technique_Rectify rectify = new Model.Technique_Rectify
{
RectifyType = "0",//安全
RectifyCode = this.txtRectifyCode.Text.Trim(),
RectifyName = this.txtRectifyName.Text.Trim()
};