lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hjgl):增加焊接日报审核流程

Browse Source
This commit is contained in:
李鹏飞
2026-05-29 14:35:20 +08:00
parent 13bff0fc63
commit cb3c2c65ad
9 changed files with 2109 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+173 -5
View File
@@ -19,7 +19,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.ddlPendingPageSize.SelectedValue = this.GridPending.PageSize.ToString();
this.txtPendingWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.InitTreeMenu();//加载树
this.BindPendingGrid();
}
}
@@ -146,12 +149,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{
this.BindGrid();
this.BindPendingGrid();
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(daily.UnitId);
if (daily != null)
{
txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(daily.UnitId);
txtTabler.Text = BLL.Person_PersonsService.GetPersonsNameById(daily.Tabler);
txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", daily.TableDate);
txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", daily.WeldingDate);
txtTabler.Text = BLL.Person_PersonsService.GetPersonsNameById(daily.Tabler);
txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", daily.TableDate);
txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", daily.WeldingDate);
}
//Model.Parameter3D parameter3D = new Model.Parameter3D();
//Model.ColorModel colorModel = new Model.ColorModel();
//colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
@@ -188,6 +195,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (this.tvControlItem.SelectedNode != null)
{
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
if (daily == null)
{
Grid1.DataSource = null;
Grid1.DataBind();
return;
}
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
@@ -229,6 +243,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
#endregion
#region 待审核数据绑定
/// <summary>
/// 绑定待审核焊接日报明细
/// </summary>
private void BindPendingGrid()
{
string strSql = @"SELECT temp.TempDetailId,
temp.WeldJointId,
temp.WeldingDate,
jot.PipelineCode,
jot.WeldJointCode,
coverWelder.WelderCode AS CoverWelderCode,
backingWelder.WelderCode AS BackingWelderCode,
temp.JointAttribute,
location.WeldingLocationCode,
jot.Size,
jot.Dia,
jot.Thickness,
jot.WeldingMethodCode,
submitPerson.PersonName AS SubmitPersonName,
temp.SubmitDate
FROM dbo.HJGL_WeldingDailyTempDetail AS temp
LEFT JOIN dbo.View_HJGL_WeldJoint AS jot ON jot.WeldJointId = temp.WeldJointId
LEFT JOIN dbo.SitePerson_Person AS coverWelder ON coverWelder.PersonId = temp.CoverWelderId
LEFT JOIN dbo.SitePerson_Person AS backingWelder ON backingWelder.PersonId = temp.BackingWelderId
LEFT JOIN dbo.Base_WeldingLocation AS location ON location.WeldingLocationId = temp.WeldingLocationId
LEFT JOIN dbo.Person_Persons AS submitPerson ON submitPerson.PersonId = temp.SubmitPersonId
WHERE temp.ProjectId = @ProjectId AND temp.AuditState = 0";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (unitWork == null)
{
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
if (daily != null)
{
unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(daily.UnitWorkId);
}
}
if (unitWork != null)
{
strSql += " AND temp.UnitWorkId = @UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", unitWork.UnitWorkId));
}
if (!string.IsNullOrEmpty(txtPendingWeldingDate.Text.Trim()))
{
strSql += " AND temp.WeldingDate >= @WeldingDate AND temp.WeldingDate < @WeldingDateEnd";
DateTime weldingDate = Convert.ToDateTime(txtPendingWeldingDate.Text.Trim()).Date;
listStr.Add(new SqlParameter("@WeldingDate", weldingDate));
listStr.Add(new SqlParameter("@WeldingDateEnd", weldingDate.AddDays(1)));
}
if (!string.IsNullOrEmpty(txtPendingPipelineCode.Text.Trim()))
{
strSql += " AND jot.PipelineCode LIKE @PendingPipelineCode";
listStr.Add(new SqlParameter("@PendingPipelineCode", "%" + txtPendingPipelineCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtPendingWelderCode.Text.Trim()))
{
strSql += " AND (coverWelder.WelderCode LIKE @PendingWelderCode OR backingWelder.WelderCode LIKE @PendingWelderCode)";
listStr.Add(new SqlParameter("@PendingWelderCode", "%" + txtPendingWelderCode.Text.Trim() + "%"));
}
strSql += " ORDER BY jot.PipelineCode, jot.WeldJointCode";
DataTable tb = SQLHelper.GetDataTableRunText(strSql, listStr.ToArray());
GridPending.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(GridPending.FilteredData, tb);
var table = this.GetPagedDataTable(GridPending, tb);
GridPending.DataSource = table;
GridPending.DataBind();
}
#endregion
#region 分页排序
#region 页索引改变事件
/// <summary>
@@ -252,6 +339,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
BindGrid();
}
/// <summary>
/// 待审核排序
/// </summary>
protected void GridPending_Sort(object sender, GridSortEventArgs e)
{
BindPendingGrid();
}
#endregion
#region 分页选择下拉改变事件
@@ -265,6 +360,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 待审核页索引改变事件
/// </summary>
protected void GridPending_PageIndexChange(object sender, GridPageEventArgs e)
{
BindPendingGrid();
}
/// <summary>
/// 待审核分页选择下拉改变事件
/// </summary>
protected void ddlPendingPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
GridPending.PageSize = Convert.ToInt32(ddlPendingPageSize.SelectedValue);
BindPendingGrid();
}
#endregion
#endregion
@@ -509,6 +621,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.InitTreeMenu();
this.BindGrid();
this.BindPendingGrid();
}
#endregion
@@ -522,6 +635,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
BindGrid();
}
/// <summary>
/// 待审核筛选
/// </summary>
protected void PendingFilter_TextChanged(object sender, EventArgs e)
{
BindPendingGrid();
}
#endregion
protected void btnOut_Click(object sender, EventArgs e)
@@ -584,5 +705,52 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
/// <summary>
/// 待审核记录审核通过
/// </summary>
protected void btnPendingAudit_Click(object sender, EventArgs e)
{
if (GridPending.SelectedRowIDArray.Length == 0)
{
ShowNotify("请选择要审核的记录", MessageBoxIcon.Warning);
return;
}
string errlog = BLL.WeldingDailyService.AuditWeldingDailyTempDetails(GridPending.SelectedRowIDArray, this.CurrUser.PersonId);
this.InitTreeMenu();
this.BindPendingGrid();
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("审核通过！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("部分记录处理失败：" + errlog, MessageBoxIcon.Warning);
}
}
/// <summary>
/// 删除未审核记录
/// </summary>
protected void btnPendingDelete_Click(object sender, EventArgs e)
{
if (GridPending.SelectedRowIDArray.Length == 0)
{
ShowNotify("请选择要删除的记录", MessageBoxIcon.Warning);
return;
}
string errlog = BLL.WeldingDailyService.DeleteWeldingDailyTempDetails(GridPending.SelectedRowIDArray);
this.BindPendingGrid();
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("删除成功！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(errlog, MessageBoxIcon.Warning);
}
}
}
}
}