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

2022-12-18 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-12-18 22:40:49 +08:00
parent 5b119bcb98
commit 802a091833
21 changed files with 280 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+26 -21
View File
@@ -194,30 +194,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
private void BindGrid(List<Model.SpWeldingDailyItem> weldingDailyItem)
{
DataTable dt = null;
//if (weldingDailyItem != null)
//{
// var task = from x in Funs.DB.View_HJGL_WeldingTask
// where (x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date == Convert.ToDateTime(txtWeldingDate.Text)
// && x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null) || x.WeldingDailyId == this.WeldingDailyId
// select x;
// dt = this.LINQToDataTable(task);
//}
//else
//{
// var task = from x in Funs.DB.View_HJGL_WeldingTask
// where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date == Convert.ToDateTime(txtWeldingDate.Text)
// && x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null
// select x;
// dt = this.LINQToDataTable(task);
//}
DataTable dt = null;
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId 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)
&& x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null) || x.WeldingDailyId == this.WeldingDailyId
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
select x.WeldJointId).Distinct().ToList();
foreach (var weldJointId in weldJointIds)
@@ -235,11 +219,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
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)
&& x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null
select x.WeldJointId).Distinct().ToList();
&& 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));
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/));
}
if (drpJointAttribute.SelectedValue != Const._Null)
{
@@ -585,13 +569,34 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
string rowId = Grid1.Rows[i].RowID;
if (this.Grid1.SelectedRowIDArray.Contains(rowId))
{
var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
if (newWeldJoint != null)
{
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value<string>("CoverWelderCode")
select x).FirstOrDefault();
if (coverWelderCode != null)
{
t.CoverWelderId = coverWelderCode.PersonId;
newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
}
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value<string>("BackingWelderCode")
select x).FirstOrDefault();
if (backingWelderCode != null)
{
t.BackingWelderId = backingWelderCode.PersonId;
newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
}
WeldTaskService.UpdateWeldTask(t);
WeldJointService.UpdateWeldJoint(newWeldJoint);
//if (!string.IsNullOrEmpty(values.Value<string>("JointAttribute").ToString()))
//{
// newWeldJoint.JointAttribute = values.Value<string>("JointAttribute").ToString();