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

2023-02-20 001 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2023-02-20 10:49:51 +08:00
parent 7e66339f48
commit ef6bbc170e
37 changed files with 1649 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+22 -13
View File
@@ -195,19 +195,20 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var aw = this.Grid1.SelectedRowIDArray;
DataTable dt = null;
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId select x;
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x;
if (weldingDailyItem != null)
{
var task = new List<Model.View_HJGL_WeldingTask>();
var weldJointIds = (from x in list
where (x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
where ( x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
select x.WeldJointId).Distinct().ToList();
foreach (var weldJointId in weldJointIds)
{
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId));
}
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{
// task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId));
//}
if (drpJointAttribute.SelectedValue != Const._Null)
{
task = task.Where(x=>x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
@@ -224,11 +225,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var weldJointIds = (from x in list
where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
select x.WeldJointId).Distinct().ToList();
foreach (var weldJointId in weldJointIds)
{
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/));
}
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{
// task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/));
//}
if (drpJointAttribute.SelectedValue != Const._Null)
{
task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
@@ -1238,6 +1240,13 @@ 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);//更改安装口时间和状态
}
this.BindGrid(GetWeldingDailyItem); // 初始化页面
}
else