提交代码

This commit is contained in:
2023-11-06 15:45:52 +08:00
parent 0b84177640
commit 47921967d7
15 changed files with 909 additions and 540 deletions
@@ -1,4 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -125,41 +126,51 @@ namespace FineUIPro.Web.CQMS.Performance
txtTaskContentZl.Text = child2List[3].TaskContent;
txtTaskContentHse.Text = child2List[4].TaskContent;
//如果数量是6 就按顺序来,7 8 则是多2条数据
if (child2List.Count == 6)
{
txtTaskContent1.Text = child2List[5].TaskContent;
txtProjectQuantity1.Text = child2List[5].ProjectQuantity;
txtDemandPlan1.Text = child2List[5].DemandPlan;
fr1.Hidden = true;
fr2.Hidden = true;
}
else if (child2List.Count == 7)
{
txtTaskContent2.Text = child2List[5].TaskContent;
txtProjectQuantity2.Text = child2List[5].ProjectQuantity;
txtDemandPlan2.Text = child2List[5].DemandPlan;
//加载grid
var Sgcount = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid).SgCount;
var list = (from x in Funs.DB.CQMS_Performance_Child2
where x.PerformanceGid == PerformanceGid
&& x.NowWeek == Convert.ToInt32(ddlNowWeek.SelectedValue) && x.SortIndex <= Sgcount
orderby x.SortIndex select x)
.ToList();
Grid1.DataSource = list;
Grid1.DataBind();
txtTaskContent1.Text = child2List[6].TaskContent;
txtProjectQuantity1.Text = child2List[6].ProjectQuantity;
txtDemandPlan1.Text = child2List[6].DemandPlan;
fr2.Hidden = true;
}
else if (child2List.Count == 8)
{
////如果数量是6 就按顺序来,7 8 则是多2条数据
//if (child2List.Count == 6)
//{
// txtTaskContent1.Text = child2List[5].TaskContent;
// txtProjectQuantity1.Text = child2List[5].ProjectQuantity;
// txtDemandPlan1.Text = child2List[5].DemandPlan;
// fr1.Hidden = true;
// fr2.Hidden = true;
//}
//else if (child2List.Count == 7)
//{
// txtTaskContent2.Text = child2List[5].TaskContent;
// txtProjectQuantity2.Text = child2List[5].ProjectQuantity;
// txtDemandPlan2.Text = child2List[5].DemandPlan;
txtTaskContent3.Text = child2List[5].TaskContent;
txtProjectQuantity3.Text = child2List[5].ProjectQuantity;
txtDemandPlan3.Text = child2List[5].DemandPlan;
// txtTaskContent1.Text = child2List[6].TaskContent;
// txtProjectQuantity1.Text = child2List[6].ProjectQuantity;
// txtDemandPlan1.Text = child2List[6].DemandPlan;
// fr2.Hidden = true;
//}
//else if (child2List.Count == 8)
//{
txtTaskContent2.Text = child2List[6].TaskContent;
txtProjectQuantity2.Text = child2List[6].ProjectQuantity;
txtDemandPlan2.Text = child2List[6].DemandPlan;
// txtTaskContent3.Text = child2List[5].TaskContent;
// txtProjectQuantity3.Text = child2List[5].ProjectQuantity;
// txtDemandPlan3.Text = child2List[5].DemandPlan;
txtTaskContent1.Text = child2List[7].TaskContent;
txtProjectQuantity1.Text = child2List[7].ProjectQuantity;
txtDemandPlan1.Text = child2List[7].DemandPlan;
}
// txtTaskContent2.Text = child2List[6].TaskContent;
// txtProjectQuantity2.Text = child2List[6].ProjectQuantity;
// txtDemandPlan2.Text = child2List[6].DemandPlan;
// txtTaskContent1.Text = child2List[7].TaskContent;
// txtProjectQuantity1.Text = child2List[7].ProjectQuantity;
// txtDemandPlan1.Text = child2List[7].DemandPlan;
//}
}
else
{
@@ -187,17 +198,17 @@ namespace FineUIPro.Web.CQMS.Performance
{
//依次修改各周任务安排
#region
var TaskContent1 = txtTaskContent1.Text.Trim();
var ProjectQuantity1 = txtProjectQuantity1.Text.Trim();
var DemandPlan1 = txtDemandPlan1.Text.Trim();
//var TaskContent1 = txtTaskContent1.Text.Trim();
//var ProjectQuantity1 = txtProjectQuantity1.Text.Trim();
//var DemandPlan1 = txtDemandPlan1.Text.Trim();
var TaskContent2 = txtTaskContent2.Text.Trim();
var ProjectQuantity2 = txtProjectQuantity2.Text.Trim();
var DemandPlan2 = txtDemandPlan2.Text.Trim();
//var TaskContent2 = txtTaskContent2.Text.Trim();
//var ProjectQuantity2 = txtProjectQuantity2.Text.Trim();
//var DemandPlan2 = txtDemandPlan2.Text.Trim();
var TaskContent3 = txtTaskContent3.Text.Trim();
var ProjectQuantity3 = txtProjectQuantity3.Text.Trim();
var DemandPlan3 = txtDemandPlan3.Text.Trim();
//var TaskContent3 = txtTaskContent3.Text.Trim();
//var ProjectQuantity3 = txtProjectQuantity3.Text.Trim();
//var DemandPlan3 = txtDemandPlan3.Text.Trim();
var TaskContentHse = txtTaskContentHse.Text.Trim();
@@ -233,48 +244,66 @@ namespace FineUIPro.Web.CQMS.Performance
child2Model.TaskContent = TaskContentHse;
db.SubmitChanges();
if (child2List.Count == 8)
{
child2Model = child2List[5];
child2Model.TaskContent = TaskContent3;
child2Model.ProjectQuantity = ProjectQuantity3;
child2Model.DemandPlan = DemandPlan3;
db.SubmitChanges();
child2Model = child2List[6];
child2Model.TaskContent = TaskContent2;
child2Model.ProjectQuantity = ProjectQuantity2;
child2Model.DemandPlan = DemandPlan2;
db.SubmitChanges();
child2Model = child2List[7];
child2Model.TaskContent = TaskContent1;
child2Model.ProjectQuantity = ProjectQuantity1;
child2Model.DemandPlan = DemandPlan1;
db.SubmitChanges();
}
else if (child2List.Count==7)
child2List = db.CQMS_Performance_Child2.Where(x => x.NowWeek == Convert.ToInt32(ddlNowWeek.SelectedValue) && x.PerformanceGid == PerformanceGid).
OrderBy(x => x.SortIndex).ToList();
var ji = 0;
//根据grid 里的进行修改
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
child2Model = child2List[5];
child2Model.TaskContent = TaskContent2;
child2Model.ProjectQuantity = ProjectQuantity2;
child2Model.DemandPlan = DemandPlan2;
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
child2Model = child2List[ji];
child2Model.TaskContent = values.Value<string>("TaskContent");
child2Model.ProjectQuantity = values.Value<string>("ProjectQuantity");
child2Model.DemandPlan = values.Value<string>("DemandPlan");
db.SubmitChanges();
ji += 1;
}
child2Model = child2List[6];
child2Model.TaskContent = TaskContent1;
child2Model.ProjectQuantity = ProjectQuantity1;
child2Model.DemandPlan = DemandPlan1;
db.SubmitChanges();
}
else if (child2List.Count==6)
{
child2Model = child2List[5];
child2Model.TaskContent = TaskContent1;
child2Model.ProjectQuantity = ProjectQuantity1;
child2Model.DemandPlan = DemandPlan1;
db.SubmitChanges();
}
//if (child2List.Count == 8)
//{
// child2Model = child2List[5];
// child2Model.TaskContent = TaskContent3;
// child2Model.ProjectQuantity = ProjectQuantity3;
// child2Model.DemandPlan = DemandPlan3;
// db.SubmitChanges();
// child2Model = child2List[6];
// child2Model.TaskContent = TaskContent2;
// child2Model.ProjectQuantity = ProjectQuantity2;
// child2Model.DemandPlan = DemandPlan2;
// db.SubmitChanges();
// child2Model = child2List[7];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
//else if (child2List.Count==7)
//{
// child2Model = child2List[5];
// child2Model.TaskContent = TaskContent2;
// child2Model.ProjectQuantity = ProjectQuantity2;
// child2Model.DemandPlan = DemandPlan2;
// db.SubmitChanges();
// child2Model = child2List[6];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
//else if (child2List.Count==6)
//{
// child2Model = child2List[5];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
ShowNotify("修改成功。", MessageBoxIcon.Success);
}
}