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

2023-10-19

Browse Source
This commit is contained in:
李鹏飞
2023-10-19 10:12:45 +08:00
parent 78a26e14c1
commit 6ac768b911
28 changed files with 2562 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+2 -2
View File
@@ -206,7 +206,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
select x).ToList();
weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x=>x.TaskDate).First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{
@@ -228,7 +228,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
select x).ToList();
weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{