diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
index 7348c717..7dff0e0f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
@@ -75,12 +75,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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);
if (welder != null)
{
welderId = welder.WED_ID;
txtWelderCode.Text = welder.WED_Code;
- txtWelderCode.Hidden = false;
}
}
}
diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
index 27ffbe7f..64178bb8 100644
--- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
@@ -168,6 +168,7 @@ namespace FineUIPro.Web.JDGL.WBS
var oldViewInfos = from x in Funs.DB.WBS_CostControl
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
+ Model.SGGLDB db = Funs.DB;
foreach (JObject mergedRow in Grid1.GetMergedData())
//foreach (JObject mergedRow in Grid1.GetModifiedData())
{
@@ -217,7 +218,7 @@ namespace FineUIPro.Web.JDGL.WBS
thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0);
thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0);
thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0);
- BLL.CostControlDetailService.UpdateCostControlDetail(costControlDetail);
+ //BLL.CostControlDetailService.UpdateCostControlDetail(costControlDetail);
}
else
{
@@ -230,60 +231,67 @@ namespace FineUIPro.Web.JDGL.WBS
thisPlanValue = (costControlDetail.PlanNum ?? 0) * (costControl.PlanPrice ?? 0);
thisRealCost = (costControlDetail.ThisNum ?? 0) * (costControl.RealPrice ?? 0);
thisPlanCost = (costControlDetail.ThisNum ?? 0) * (costControl.PlanPrice ?? 0);
- BLL.CostControlDetailService.AddCostControlDetail(costControlDetail);
+ //BLL.CostControlDetailService.AddCostControlDetail(costControlDetail);
+ db.WBS_CostControlDetail.InsertOnSubmit(costControlDetail);
}
//累加变化值，计算总的变化值
changeThisPlanValue += thisPlanValue - oldThisPlanValue;
changeThisRealCost += thisRealCost - oldThisRealCost;
changeThisPlanCost += thisPlanCost - oldThisPlanCost;
- //更新工作包、工作项
- Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(costControl.WbsSetId);
- UpdateWbsSetDetail(costControl.WbsSetId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
- //更新分部
- Model.WBS_CostControlParentDetail unitProjectDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.UnitProjectId, months[j]);
- if (unitProjectDetail != null)
+ if (changeThisPlanValue != 0 || changeThisRealCost != 0 || changeThisPlanCost != 0)
{
- unitProjectDetail.ThisPlanValue += changeThisPlanValue;
- unitProjectDetail.ThisRealCost += changeThisRealCost;
- unitProjectDetail.ThisPlanCost += changeThisPlanCost;
- BLL.CostControlParentDetailService.UpdateCostControlParentDetail(unitProjectDetail);
- }
- else
- {
- unitProjectDetail = new Model.WBS_CostControlParentDetail();
- unitProjectDetail.CostControlParentDetailId = SQLHelper.GetNewID();
- unitProjectDetail.ParentId = wbsSet.UnitProjectId;
- unitProjectDetail.Months = months[j];
- unitProjectDetail.ThisPlanValue = changeThisPlanValue;
- unitProjectDetail.ThisRealCost = changeThisRealCost;
- unitProjectDetail.ThisPlanCost = changeThisPlanCost;
- BLL.CostControlParentDetailService.AddCostControlParentDetail(unitProjectDetail);
- }
- //更新专业
- if (!string.IsNullOrEmpty(wbsSet.CnProfessionId))
- {
- Model.WBS_CostControlParentDetail cnProfessionDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.CnProfessionId, months[j]);
- if (cnProfessionDetail != null)
+ //更新工作包、工作项
+ Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(costControl.WbsSetId);
+ UpdateWbsSetDetail(db, costControl.WbsSetId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
+ //更新分部
+ Model.WBS_CostControlParentDetail unitProjectDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.UnitProjectId, months[j]);
+ if (unitProjectDetail != null)
{
- cnProfessionDetail.ThisPlanValue += changeThisPlanValue;
- cnProfessionDetail.ThisRealCost += changeThisRealCost;
- cnProfessionDetail.ThisPlanCost += changeThisPlanCost;
- BLL.CostControlParentDetailService.UpdateCostControlParentDetail(cnProfessionDetail);
+ unitProjectDetail.ThisPlanValue += changeThisPlanValue;
+ unitProjectDetail.ThisRealCost += changeThisRealCost;
+ unitProjectDetail.ThisPlanCost += changeThisPlanCost;
+ //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(unitProjectDetail);
}
else
{
- cnProfessionDetail = new Model.WBS_CostControlParentDetail();
- cnProfessionDetail.CostControlParentDetailId = SQLHelper.GetNewID();
- cnProfessionDetail.ParentId = wbsSet.CnProfessionId;
- cnProfessionDetail.Months = months[j];
- cnProfessionDetail.ThisPlanValue = changeThisPlanValue;
- cnProfessionDetail.ThisRealCost = changeThisRealCost;
- cnProfessionDetail.ThisPlanCost = changeThisPlanCost;
- BLL.CostControlParentDetailService.AddCostControlParentDetail(cnProfessionDetail);
+ unitProjectDetail = new Model.WBS_CostControlParentDetail();
+ unitProjectDetail.CostControlParentDetailId = SQLHelper.GetNewID();
+ unitProjectDetail.ParentId = wbsSet.UnitProjectId;
+ unitProjectDetail.Months = months[j];
+ unitProjectDetail.ThisPlanValue = changeThisPlanValue;
+ unitProjectDetail.ThisRealCost = changeThisRealCost;
+ unitProjectDetail.ThisPlanCost = changeThisPlanCost;
+ //BLL.CostControlParentDetailService.AddCostControlParentDetail(unitProjectDetail);
+ db.WBS_CostControlParentDetail.InsertOnSubmit(unitProjectDetail);
}
+ //更新专业
+ if (!string.IsNullOrEmpty(wbsSet.CnProfessionId))
+ {
+ Model.WBS_CostControlParentDetail cnProfessionDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(wbsSet.CnProfessionId, months[j]);
+ if (cnProfessionDetail != null)
+ {
+ cnProfessionDetail.ThisPlanValue += changeThisPlanValue;
+ cnProfessionDetail.ThisRealCost += changeThisRealCost;
+ cnProfessionDetail.ThisPlanCost += changeThisPlanCost;
+ //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(cnProfessionDetail);
+ }
+ else
+ {
+ cnProfessionDetail = new Model.WBS_CostControlParentDetail();
+ cnProfessionDetail.CostControlParentDetailId = SQLHelper.GetNewID();
+ cnProfessionDetail.ParentId = wbsSet.CnProfessionId;
+ cnProfessionDetail.Months = months[j];
+ cnProfessionDetail.ThisPlanValue = changeThisPlanValue;
+ cnProfessionDetail.ThisRealCost = changeThisRealCost;
+ cnProfessionDetail.ThisPlanCost = changeThisPlanCost;
+ //BLL.CostControlParentDetailService.AddCostControlParentDetail(cnProfessionDetail);
+ db.WBS_CostControlParentDetail.InsertOnSubmit(cnProfessionDetail);
+ }
+ }
+ //更新装置
+ UpdateInstallationDetail(db, wbsSet.InstallationId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
+ db.SubmitChanges();
}
- //更新装置
- UpdateInstallationDetail(wbsSet.InstallationId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
}
}
}
@@ -298,7 +306,7 @@ namespace FineUIPro.Web.JDGL.WBS
///
///
///
- 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);
if (wbsSet != null)
@@ -309,7 +317,7 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue += changeThisPlanValue;
parentDetail.ThisRealCost += changeThisRealCost;
parentDetail.ThisPlanCost += changeThisPlanCost;
- BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
+ //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
}
else
{
@@ -320,11 +328,12 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue = changeThisPlanValue;
parentDetail.ThisRealCost = changeThisRealCost;
parentDetail.ThisPlanCost = changeThisPlanCost;
- BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
+ //BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
+ db.WBS_CostControlParentDetail.InsertOnSubmit(parentDetail);
}
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
///
///
///
- 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);
if (installation != null)
@@ -389,7 +398,7 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue += changeThisPlanValue;
parentDetail.ThisRealCost += changeThisRealCost;
parentDetail.ThisPlanCost += changeThisPlanCost;
- BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
+ //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail);
}
else
{
@@ -400,11 +409,12 @@ namespace FineUIPro.Web.JDGL.WBS
parentDetail.ThisPlanValue = changeThisPlanValue;
parentDetail.ThisRealCost = changeThisRealCost;
parentDetail.ThisPlanCost = changeThisPlanCost;
- BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
+ //BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail);
+ db.WBS_CostControlParentDetail.InsertOnSubmit(parentDetail);
}
if (installation.SuperInstallationId != null) //还存在上级节点，需要继续循环
{
- UpdateInstallationDetail(installation.SuperInstallationId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
+ UpdateInstallationDetail(db, installation.SuperInstallationId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost);
}
}
}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index a1008b3a..a87591a3 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -29,7 +29,11 @@ namespace Model
#region 可扩展性方法定义
partial void OnCreated();
- partial void InsertAccident_AccidentHandle(Accident_AccidentHandle instance);
+ partial void OnCreated()
+ {
+ this.CommandTimeout = 3600;
+ }
+ partial void InsertAccident_AccidentHandle(Accident_AccidentHandle instance);
partial void UpdateAccident_AccidentHandle(Accident_AccidentHandle instance);
partial void DeleteAccident_AccidentHandle(Accident_AccidentHandle instance);
partial void InsertAccident_AccidentPersonRecord(Accident_AccidentPersonRecord instance);