lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改进度工作量录入

This commit is contained in:
高飞 2023-07-04 18:53:13 +08:00
parent 4186d98a14
commit 89c0966c2a
3 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
View File

@ -75,12 +75,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (this.drpPostId.SelectedText == "焊工") if (this.drpPostId.SelectedText == "焊工")
{ {
txtWelderCode.Hidden = false;
var welder = Funs.DB.BS_Welder.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.WED_Name == inspectionPerson.PersonName); var welder = Funs.DB.BS_Welder.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.WED_Name == inspectionPerson.PersonName);
if (welder != null) if (welder != null)
{ {
welderId = welder.WED_ID; welderId = welder.WED_ID;
txtWelderCode.Text = welder.WED_Code; txtWelderCode.Text = welder.WED_Code;
txtWelderCode.Hidden = false;
} }
} }
} }

42
SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
View File

@ -168,6 +168,7 @@ namespace FineUIPro.Web.JDGL.WBS
var oldViewInfos = from x in Funs.DB.WBS_CostControl var oldViewInfos = from x in Funs.DB.WBS_CostControl
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
select x; select x;
Model.SGGLDB db = Funs.DB;
foreach (JObject mergedRow in Grid1.GetMergedData()) foreach (JObject mergedRow in Grid1.GetMergedData())
//foreach (JObject mergedRow in Grid1.GetModifiedData()) //foreach (JObject mergedRow in Grid1.GetModifiedData())
{ {
@ -217,7 +218,7 @@ namespace FineUIPro.Web.JDGL.WBS
thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0); thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0);
thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0); thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0);
thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0); thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0);
BLL.CostControlDetailService.UpdateCostControlDetail(costControlDetail); //BLL.CostControlDetailService.UpdateCostControlDetail(costControlDetail);
} }
else else
{ {
@ -230,15 +231,18 @@ namespace FineUIPro.Web.JDGL.WBS
thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0); thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0);
thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0); thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0);
thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0); thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0);
BLL.CostControlDetailService.AddCostControlDetail(costControlDetail); //BLL.CostControlDetailService.AddCostControlDetail(costControlDetail);
db.WBS_CostControlDetail.InsertOnSubmit(costControlDetail);
} }
//累加变化值，计算总的变化值 //累加变化值，计算总的变化值
changeThisPlanValue += thisPlanValue - oldThisPlanValue; changeThisPlanValue += thisPlanValue - oldThisPlanValue;
changeThisRealCost += thisRealCost - oldThisRealCost; changeThisRealCost += thisRealCost - oldThisRealCost;
changeThisPlanCost += thisPlanCost - oldThisPlanCost; changeThisPlanCost += thisPlanCost - oldThisPlanCost;
if (changeThisPlanValue != 0 || changeThisRealCost != 0 || changeThisPlanCost != 0)
{
//更新工作包、工作项 //更新工作包、工作项
Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(costControl.WbsSetId); Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(costControl.WbsSetId);
UpdateWbsSetDetail(costControl.WbsSetId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost); UpdateWbsSetDetail(db, costControl.WbsSetId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
//更新分部 //更新分部
Model.WBS_CostControlParentDetail unitProjectDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.UnitProjectId, months[j]); Model.WBS_CostControlParentDetail unitProjectDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.UnitProjectId, months[j]);
if (unitProjectDetail != null) if (unitProjectDetail != null)
@ -246,7 +250,7 @@ namespace FineUIPro.Web.JDGL.WBS
unitProjectDetail.ThisPlanValue += changeThisPlanValue; unitProjectDetail.ThisPlanValue += changeThisPlanValue;
unitProjectDetail.ThisRealCost += changeThisRealCost; unitProjectDetail.ThisRealCost += changeThisRealCost;
unitProjectDetail.ThisPlanCost += changeThisPlanCost; unitProjectDetail.ThisPlanCost += changeThisPlanCost;
BLL.CostControlParentDetailService.UpdateCostControlParentDetail(unitProjectDetail); //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(unitProjectDetail);
} }
else else
{ {
@ -257,7 +261,8 @@ namespace FineUIPro.Web.JDGL.WBS
unitProjectDetail.ThisPlanValue = changeThisPlanValue; unitProjectDetail.ThisPlanValue = changeThisPlanValue;
unitProjectDetail.ThisRealCost = changeThisRealCost; unitProjectDetail.ThisRealCost = changeThisRealCost;
unitProjectDetail.ThisPlanCost = changeThisPlanCost; unitProjectDetail.ThisPlanCost = changeThisPlanCost;
BLL.CostControlParentDetailService.AddCostControlParentDetail(unitProjectDetail); //BLL.CostControlParentDetailService.AddCostControlParentDetail(unitProjectDetail);
db.WBS_CostControlParentDetail.InsertOnSubmit(unitProjectDetail);
} }
//更新专业 //更新专业
if (!string.IsNullOrEmpty(wbsSet.CnProfessionId)) if (!string.IsNullOrEmpty(wbsSet.CnProfessionId))
@ -268,7 +273,7 @@ namespace FineUIPro.Web.JDGL.WBS
cnProfessionDetail.ThisPlanValue += changeThisPlanValue; cnProfessionDetail.ThisPlanValue += changeThisPlanValue;
cnProfessionDetail.ThisRealCost += changeThisRealCost; cnProfessionDetail.ThisRealCost += changeThisRealCost;
cnProfessionDetail.ThisPlanCost += changeThisPlanCost; cnProfessionDetail.ThisPlanCost += changeThisPlanCost;
BLL.CostControlParentDetailService.UpdateCostControlParentDetail(cnProfessionDetail); //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(cnProfessionDetail);
} }
else else
{ {
@ -279,11 +284,14 @@ namespace FineUIPro.Web.JDGL.WBS
cnProfessionDetail.ThisPlanValue = changeThisPlanValue; cnProfessionDetail.ThisPlanValue = changeThisPlanValue;
cnProfessionDetail.ThisRealCost = changeThisRealCost; cnProfessionDetail.ThisRealCost = changeThisRealCost;
cnProfessionDetail.ThisPlanCost = changeThisPlanCost; cnProfessionDetail.ThisPlanCost = changeThisPlanCost;
BLL.CostControlParentDetailService.AddCostControlParentDetail(cnProfessionDetail); //BLL.CostControlParentDetailService.AddCostControlParentDetail(cnProfessionDetail);
db.WBS_CostControlParentDetail.InsertOnSubmit(cnProfessionDetail);
} }
} }
//更新装置 //更新装置
UpdateInstallationDetail(wbsSet.InstallationId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost); UpdateInstallationDetail(db, wbsSet.InstallationId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
db.SubmitChanges();
}
} }
} }
} }
@ -298,7 +306,7 @@ namespace FineUIPro.Web.JDGL.WBS
/// <param name="months"></param> /// <param name="months"></param>
/// <param name="planValue"></param> /// <param name="planValue"></param>
/// <param name="parentId"></param> /// <param name="parentId"></param>
private void UpdateWbsSetDetail(string wbsSetId, DateTime months, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost) private void UpdateWbsSetDetail(Model.SGGLDB db, string wbsSetId, DateTime months, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost)
{ {
Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(wbsSetId); Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(wbsSetId);
if (wbsSet != null) if (wbsSet != null)
@ -309,7 +317,7 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue += changeThisPlanValue; parentDetail.ThisPlanValue += changeThisPlanValue;
parentDetail.ThisRealCost += changeThisRealCost; parentDetail.ThisRealCost += changeThisRealCost;
parentDetail.ThisPlanCost += changeThisPlanCost; parentDetail.ThisPlanCost += changeThisPlanCost;
BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail); //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
} }
else else
{ {
@ -320,11 +328,12 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue = changeThisPlanValue; parentDetail.ThisPlanValue = changeThisPlanValue;
parentDetail.ThisRealCost = changeThisRealCost; parentDetail.ThisRealCost = changeThisRealCost;
parentDetail.ThisPlanCost = changeThisPlanCost; parentDetail.ThisPlanCost = changeThisPlanCost;
BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail); //BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
db.WBS_CostControlParentDetail.InsertOnSubmit(parentDetail);
} }
if (wbsSet.SuperWbsSetId != null) //还存在上级节点，需要继续循环 if (wbsSet.SuperWbsSetId != null) //还存在上级节点，需要继续循环
{ {
UpdateWbsSetDetail(wbsSet.SuperWbsSetId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost); UpdateWbsSetDetail(db, wbsSet.SuperWbsSetId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
} }
} }
} }
@ -378,7 +387,7 @@ namespace FineUIPro.Web.JDGL.WBS
/// <param name="months"></param> /// <param name="months"></param>
/// <param name="planValue"></param> /// <param name="planValue"></param>
/// <param name="parentId"></param> /// <param name="parentId"></param>
private void UpdateInstallationDetail(string installationId, DateTime months, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost) private void UpdateInstallationDetail(Model.SGGLDB db, string installationId, DateTime months, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost)
{ {
Model.Project_Installation installation = BLL.Project_InstallationService.GetInstallationByInstallationId(installationId); Model.Project_Installation installation = BLL.Project_InstallationService.GetInstallationByInstallationId(installationId);
if (installation != null) if (installation != null)
@ -389,7 +398,7 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue += changeThisPlanValue; parentDetail.ThisPlanValue += changeThisPlanValue;
parentDetail.ThisRealCost += changeThisRealCost; parentDetail.ThisRealCost += changeThisRealCost;
parentDetail.ThisPlanCost += changeThisPlanCost; parentDetail.ThisPlanCost += changeThisPlanCost;
BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail); //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
} }
else else
{ {
@ -400,11 +409,12 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue = changeThisPlanValue; parentDetail.ThisPlanValue = changeThisPlanValue;
parentDetail.ThisRealCost = changeThisRealCost; parentDetail.ThisRealCost = changeThisRealCost;
parentDetail.ThisPlanCost = changeThisPlanCost; parentDetail.ThisPlanCost = changeThisPlanCost;
BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail); //BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
db.WBS_CostControlParentDetail.InsertOnSubmit(parentDetail);
} }
if (installation.SuperInstallationId != null) //还存在上级节点，需要继续循环 if (installation.SuperInstallationId != null) //还存在上级节点，需要继续循环
{ {
UpdateInstallationDetail(installation.SuperInstallationId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost); UpdateInstallationDetail(db, installation.SuperInstallationId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
} }
} }
} }

4
SGGL/Model/Model.cs
View File

@ -29,6 +29,10 @@ namespace Model
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnCreated(); partial void OnCreated();
partial void OnCreated()
{
this.CommandTimeout = 3600;
}
partial void InsertAccident_AccidentHandle(Accident_AccidentHandle instance); partial void InsertAccident_AccidentHandle(Accident_AccidentHandle instance);
partial void UpdateAccident_AccidentHandle(Accident_AccidentHandle instance); partial void UpdateAccident_AccidentHandle(Accident_AccidentHandle instance);
partial void DeleteAccident_AccidentHandle(Accident_AccidentHandle instance); partial void DeleteAccident_AccidentHandle(Accident_AccidentHandle instance);