代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
+46
-49
@@ -7,10 +7,7 @@ using System.Data;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using Model;
|
||||
|
||||
namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
{
|
||||
@@ -23,7 +20,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
{
|
||||
InitGrid();
|
||||
}
|
||||
public DataTable GridTable=new DataTable();
|
||||
public DataTable GridTable = new DataTable();
|
||||
private void InitGrid()
|
||||
{
|
||||
FineUIPro.BoundField bf;
|
||||
@@ -33,7 +30,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
|
||||
ContractId = Request.Params["ContractId"];
|
||||
|
||||
GridTable.Columns.Add("Id");
|
||||
GridTable.Columns.Add("Id");
|
||||
GridTable.Columns.Add("SerialNumber");
|
||||
ListItem[] list = new ListItem[8];
|
||||
list[0] = new ListItem("主项号", "MainItemCode");
|
||||
@@ -65,8 +62,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
queryContractTrack.ProjectId = this.CurrUser.LoginProjectId;
|
||||
queryContractTrack.ContractId = this.ContractId;
|
||||
var modelContractTracks = BLL.PhtglContractTrackService.GetFirstPHTGL_ContractTrackByModle(queryContractTrack);
|
||||
if (modelContractTracks==null) return;
|
||||
|
||||
if (modelContractTracks == null) return;
|
||||
|
||||
|
||||
Model.PHTGL_ContractTrackProgress table = new Model.PHTGL_ContractTrackProgress();
|
||||
table.ContractTrackId = modelContractTracks.Id;
|
||||
@@ -74,7 +71,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
foreach (var item in tb)
|
||||
{
|
||||
//string date = item.Date.Replace("-", "");
|
||||
string date = item.Date+"#" ;
|
||||
string date = item.Date + "#";
|
||||
GroupField p = new GroupField();
|
||||
p.HeaderText = item.Date;
|
||||
p.TextAlign = TextAlign.Center;
|
||||
@@ -85,7 +82,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
|
||||
GroupField p1BCWS = new GroupField();
|
||||
p1BCWS.HeaderText = "BCWS";
|
||||
p1BCWS.TextAlign = TextAlign.Center;
|
||||
p1BCWS.TextAlign = TextAlign.Center;
|
||||
p1BCWS.Attributes["data-color"] = "color1";
|
||||
GroupField p1ACWP = new GroupField();
|
||||
p1ACWP.HeaderText = "ACWP";
|
||||
@@ -111,10 +108,10 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
#region BCWS
|
||||
|
||||
txTextBox = new FineUIPro.TextBox();
|
||||
txTextBox.ID = "txt" +date+ "BCWS_Quantity";
|
||||
txTextBox.ID = "txt" + date + "BCWS_Quantity";
|
||||
rf = new RenderField();
|
||||
rf.ColumnID = date+"BCWS_Quantity";
|
||||
rf.DataField = date+"BCWS_Quantity";
|
||||
rf.ColumnID = date + "BCWS_Quantity";
|
||||
rf.DataField = date + "BCWS_Quantity";
|
||||
rf.HeaderText = "工程量";
|
||||
rf.TextAlign = FineUIPro.TextAlign.Left;
|
||||
rf.Editor.Add(txTextBox);
|
||||
@@ -253,15 +250,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
p2.Columns.Add(p2ACWP);
|
||||
|
||||
p.Columns.Add(p1);
|
||||
p.Columns.Add(p2);
|
||||
p.Columns.Add(p2);
|
||||
|
||||
Grid1.Columns.Add(p);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
public string ContractId
|
||||
{
|
||||
@@ -272,9 +269,9 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.GetButtonPower();
|
||||
this.GetButtonPower();
|
||||
|
||||
PHTGL_QuantityService.IniGetMajorItems3DownList(drpMajorItems, true);
|
||||
PHTGL_QuantityService.IniGetMajorItems3DownList(drpMajorItems, true);
|
||||
|
||||
// 绑定表格
|
||||
this.BindGrid();
|
||||
@@ -314,7 +311,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
Parallel.ForEach(splitContractTracks, parallelOptions, sublist =>
|
||||
{
|
||||
var tempTable = GridTable.Clone(); // 创建临时的 DataTable
|
||||
foreach (var item in sublist)
|
||||
foreach (var item in sublist)
|
||||
{
|
||||
DataRow row = tempTable.NewRow();
|
||||
row["SerialNumber"] = item.SerialNumber;
|
||||
@@ -353,7 +350,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
row[date + "SumACWP_Percentage"] = SumModel.ACWP_Percentage;
|
||||
}
|
||||
concurrentGridTable.TryAdd(item.Id, row);
|
||||
// GridTable.Rows.Add(row);
|
||||
// GridTable.Rows.Add(row);
|
||||
}
|
||||
});
|
||||
// 将线程安全的数据拷贝到 GridTable
|
||||
@@ -364,10 +361,10 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
GridTable.Rows.Add(newRow);
|
||||
}
|
||||
Grid1.RecordCount = count;
|
||||
Grid1.DataSource = GridTable.AsEnumerable().OrderBy(x => x["SerialNumber"].ToString(), new CustomComparer());;
|
||||
Grid1.DataSource = GridTable.AsEnumerable().OrderBy(x => x["SerialNumber"].ToString(), new CustomComparer()); ;
|
||||
Grid1.DataBind();
|
||||
}
|
||||
}
|
||||
}
|
||||
protected void Grid1_OnRowDataBound(object sender, GridRowEventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(ContractId))
|
||||
@@ -492,44 +489,44 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
if (EditorArr.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < EditorArr.Count; i++)
|
||||
{
|
||||
{
|
||||
JObject objects = (JObject)EditorArr[i];
|
||||
|
||||
var listfiled = objects["values"].ToList();
|
||||
var listfiled = objects["values"].ToList();
|
||||
|
||||
var Id = objects["id"].ToString();
|
||||
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(Id);
|
||||
|
||||
|
||||
if (model!=null)
|
||||
{
|
||||
foreach (var item in listfiled) //遍历行中的字段
|
||||
{
|
||||
var b = item;
|
||||
var txtname = b.First.Path.Substring(b.First.Path.LastIndexOf('.') + 1);
|
||||
var txtvalue = b.First.Value<string>();
|
||||
string date = txtname.Split('#')[0].ToString();
|
||||
string filed = txtname.Split('#')[1].ToString();
|
||||
var Id = objects["id"].ToString();
|
||||
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(Id);
|
||||
|
||||
var modelContractTrackProgress = PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByTrackIdAndDate(Id, date);
|
||||
if (modelContractTrackProgress!=null)
|
||||
{
|
||||
switch (filed)
|
||||
{
|
||||
|
||||
if (model != null)
|
||||
{
|
||||
foreach (var item in listfiled) //遍历行中的字段
|
||||
{
|
||||
var b = item;
|
||||
var txtname = b.First.Path.Substring(b.First.Path.LastIndexOf('.') + 1);
|
||||
var txtvalue = b.First.Value<string>();
|
||||
string date = txtname.Split('#')[0].ToString();
|
||||
string filed = txtname.Split('#')[1].ToString();
|
||||
|
||||
var modelContractTrackProgress = PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByTrackIdAndDate(Id, date);
|
||||
if (modelContractTrackProgress != null)
|
||||
{
|
||||
switch (filed)
|
||||
{
|
||||
case "ACWP_Quantity":
|
||||
modelContractTrackProgress.ACWP_Quantity = Funs.GetNewDecimalOrZero(txtvalue) ;
|
||||
modelContractTrackProgress.ACWP_Quantity = Funs.GetNewDecimalOrZero(txtvalue);
|
||||
break;
|
||||
case "BCWS_Quantity":
|
||||
modelContractTrackProgress.BCWS_Quantity = Funs.GetNewDecimalOrZero(txtvalue);
|
||||
break;
|
||||
}
|
||||
}
|
||||
PhtglContracttrackprogressService.UpdatePHTGL_ContractTrackProgress(modelContractTrackProgress);
|
||||
}
|
||||
PhtglContracttrackprogressService.UpdatePHTGL_ContractTrackProgress(modelContractTrackProgress);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -542,7 +539,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
private void CheckProgressd()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(ContractId))
|
||||
{
|
||||
{
|
||||
Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack();
|
||||
queryContractTrack.ProjectId = this.CurrUser.LoginProjectId;
|
||||
queryContractTrack.ContractId = this.ContractId;
|
||||
@@ -595,11 +592,11 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnModify))
|
||||
{
|
||||
// this.btnMenuEdit.Hidden = false;
|
||||
// this.btnMenuEdit.Hidden = false;
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnDelete))
|
||||
{
|
||||
// this.btnMenuDelete.Hidden = false;
|
||||
// this.btnMenuDelete.Hidden = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user