1221-002-gaofei

This commit is contained in:
gaofei
2021-12-21 16:10:02 +08:00
parent 6887e55225
commit 0bf6d1efd7
22 changed files with 1553 additions and 548 deletions
+25 -32
View File
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.JDGL.WBS
// }
//}
Model.Project_Installation installation = BLL.Project_InstallationService.GetProjectInstallationByProjectId(this.CurrUser.LoginProjectId);
if(installation!=null)
if (installation != null)
{
TreeNode newNode = new TreeNode();
newNode.Text = "[" + installation.InstallationCode + "]" + installation.InstallationName;
@@ -1394,42 +1394,29 @@ namespace FineUIPro.Web.JDGL.WBS
bool isPass = true;
if (isPass)
{
foreach (var item in this.Grid1.SelectedRowIDArray)
{
Model.WBS_CostControl costControl = BLL.CostControlService.GetCostControlByCostControlId(item);
}
foreach (JObject mergedRow in mergedData)
{
JObject values = mergedRow.Value<JObject>("values");
string costControlId = values.Value<string>("CostControlId");
string totalNum = values.Value<string>("TotalNum");
string realPrice = values.Value<string>("RealPrice");
string planPrice = values.Value<string>("PlanPrice");
//string totalNum = values.Value<string>("TotalNum");
//string realPrice = values.Value<string>("RealPrice");
//string planPrice = values.Value<string>("PlanPrice");
Model.WBS_CostControl costControl = BLL.CostControlService.GetCostControlByCostControlId(costControlId);
if (costControl != null)
if (this.Grid1.SelectedRowIDArray.Contains(costControlId))
{
if (!string.IsNullOrEmpty(totalNum))
{
costControl.TotalNum = Convert.ToDecimal(totalNum);
}
else
{
costControl.TotalNum = null;
}
if (!string.IsNullOrEmpty(realPrice))
{
costControl.RealPrice = Convert.ToDecimal(realPrice);
}
else
{
costControl.RealPrice = null;
}
if (!string.IsNullOrEmpty(planPrice))
{
costControl.PlanPrice = Convert.ToDecimal(planPrice);
}
else
{
costControl.RealPrice = null;
}
BLL.CostControlService.UpdateCostControl(costControl);
costControl.IsSelected = true;
}
else
{
costControl.IsSelected = false;
}
BLL.CostControlService.UpdateCostControl(costControl);
}
}
BindGrid();
@@ -1513,6 +1500,12 @@ namespace FineUIPro.Web.JDGL.WBS
Grid1.DataSource = table;
Grid1.DataBind();
var costControls = BLL.CostControlService.GetSelectedCostControlsByWbsSetId(this.trWBS.SelectedNodeID);
if (costControls.Count > 0)
{
var selectIds = costControls.Select(x => x.CostControlId).ToArray();
this.Grid1.SelectedRowIDArray = selectIds;
}
}
else
{
@@ -2402,8 +2395,8 @@ namespace FineUIPro.Web.JDGL.WBS
this.btnMenuAdd.Hidden = false;
this.btnAdd.Hidden = false;
this.btnMenuCopy.Hidden = false;
this.btnMenuDetail.Hidden = false;
this.btnMenuWeekDetail.Hidden = false;
//this.btnMenuDetail.Hidden = false;
//this.btnMenuWeekDetail.Hidden = false;
//this.btnMenuCopy2.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))