危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
@@ -376,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
row["index"] = 0;
|
||||
}
|
||||
@@ -704,7 +703,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
row["index"] = 0;
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
row["index"] = 0;
|
||||
}
|
||||
@@ -185,7 +185,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </summary>
|
||||
/// <param name="grid"></param>
|
||||
/// <returns></returns>
|
||||
private string GetGridTableHtml(Grid grid)
|
||||
private new string GetGridTableHtml(Grid grid)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
|
||||
|
||||
@@ -738,10 +738,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
if (isoId != null)
|
||||
{
|
||||
var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == isoId.ToString() select x).Count();
|
||||
if (jotCount != null)
|
||||
{
|
||||
return jotCount.ToString();
|
||||
}
|
||||
return jotCount.ToString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -409,11 +409,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
return;
|
||||
}
|
||||
|
||||
bool isShow = true;
|
||||
if (Grid1.SelectedRowIndexArray.Length > 1)
|
||||
{
|
||||
isShow = false;
|
||||
}
|
||||
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
|
||||
{
|
||||
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
|
||||
|
||||
@@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-");
|
||||
|
||||
}
|
||||
catch (Exception ee) { }
|
||||
catch (Exception) { }
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -421,7 +421,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-");
|
||||
|
||||
}
|
||||
catch (Exception ee) { }
|
||||
catch (Exception) { }
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
cbJOTDia.Checked = false;
|
||||
}
|
||||
} catch (Exception ex) { }
|
||||
} catch (Exception) { }
|
||||
|
||||
BindGrid(isoId);
|
||||
//未点口的焊工
|
||||
@@ -325,7 +325,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
row["index"] = 0;
|
||||
}
|
||||
|
||||
@@ -249,7 +249,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
row["index"] = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user