This commit is contained in:
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
@@ -35,14 +35,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitId", null));
}
if (this.drpInstallationId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@installationId", this.drpInstallationId.SelectedValue));
@@ -50,6 +43,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
else
{
listStr.Add(new SqlParameter("@installationId", null));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitId", null));
}
if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null)
{
@@ -61,7 +63,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
}
if (this.drpPipingClassId.SelectedValue!=BLL.Const._Null)
{
listStr.Add(new SqlParameter("@pipingClassId", this.drpWorkAreaId.SelectedValue));
listStr.Add(new SqlParameter("@pipingClassId", this.drpPipingClassId.SelectedValue));
}
else
{
@@ -71,6 +73,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
listStr.Add(new SqlParameter("@ndeCode", this.txtNDECode.Text.Trim()));
}
else
{
listStr.Add(new SqlParameter("@ndeCode", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WeldSummary", parameter);
this.Grid1.RecordCount = tb.Rows.Count;