20230220 003焊接修改

This commit is contained in:
2023-02-20 21:59:35 +08:00
parent e2edbb0f51
commit 8e8eecbcfc
28 changed files with 4507 additions and 348 deletions
@@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.HJGL.WeldingManage;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -248,6 +249,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
// tb = GetFilteredTable(Grid1.FilteredData, tb);
//var table = this.GetPagedDataTable(Grid1, dt);
Grid1.RecordCount = task.Count;
// var table = task.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
Grid1.DataSource = task;
Grid1.DataBind();
@@ -622,6 +624,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//}
#endregion
ChanggeState();//更新焊口属性
//更新焊口属性
if (string.IsNullOrEmpty(errlog))
{
@@ -1240,14 +1244,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var item in GetWeldingDailyItem)
{
var daily= BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
}
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
this.BindGrid(GetWeldingDailyItem); // 初始化页面
}
else
@@ -1256,7 +1253,21 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
private void ChanggeState()
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var item in GetWeldingDailyItem)
{
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
}
}
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
@@ -1289,5 +1300,25 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
// }
//}
}
#region
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
this.BindGrid(GetWeldingDailyItem); // 初始化页面
}
else
{
this.BindGrid(null);
}
}
#endregion
}
}