fix:升级

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
@@ -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);
}