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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
杨红卫
2023-09-07 08:51:33 +08:00
parent b3e1db7611 c4aecfbcaf
commit a291f3aed6
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+11 -11
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+4 -4
View File
@@ -526,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var t = BLL.WeldTaskService.GetWeldTaskById(row);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
}
else
@@ -536,7 +536,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
else
{
@@ -1062,7 +1062,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x;
string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId;
/*// 删除焊口所在批明细信息
// 删除焊口所在批明细信息
BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId);
// 删除批信息
@@ -1070,7 +1070,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (pointBatchId != null && batch.Count() == 0)
{
BLL.PointBatchService.DeleteBatch(pointBatchId);
}*/
}
}
}
else
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+2 -2
View File
@@ -427,7 +427,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (batchC != null)
{
string batchCondition = batchC.SetValue;
BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition);
//BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition);
}
@@ -919,7 +919,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (task != null)
{
BLL.WeldTaskService.DeleteWeldingTask(task.WeldTaskId);
PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId);
//PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId);
}
}
ShowNotify("删除成功！", MessageBoxIcon.Success);