lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

五环二期集团数据对接

Browse Source
This commit is contained in:
夏菊
2025-06-19 16:55:10 +08:00
parent 5ed020c7e1
commit 0736adf719
105 changed files with 14375 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+27 -1
View File
@@ -454,9 +454,34 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
Model.HSSE_Hazard_HazardRegister hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
//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
//{
// Alert.ShowInTop("已闭环，无法删除！", MessageBoxIcon.Warning);
// return;
//}
}
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
BindGrid();
ShowNotify("删除成功!", MessageBoxIcon.Success);
}
@@ -467,6 +492,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
return;
}
}
#endregion
#region 格式化字符串
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+21 -3
View File
@@ -254,15 +254,33 @@ 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);
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkPermit);
this.BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
#endregion
#region 获取按钮权限
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs
+22 -4
View File
@@ -245,16 +245,34 @@ 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);
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
BindGrid();
ShowNotify("删除数据成功!（表格数据已重新绑定）");
}
}
#endregion
#region 获取按钮权限
SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs
+3 -22
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;
@@ -557,24 +557,5 @@ namespace FineUIPro.Web.HSSE.Technique
}
}
#endregion
/// <summary>
/// 从集团获取
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnGet_Click(object sender, EventArgs e)
{
var returnValue = CNCECHSSEWebService.getTechnique_RectifyList();
if (returnValue.code == 1)
{
ShowNotify(returnValue.message, MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
}
}
}
}
SGGL/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()
};