lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-11-10

Browse Source
This commit is contained in:
李鹏飞
2023-11-10 15:21:35 +08:00
parent 71dca3c416
commit 13cfea61ed
10 changed files with 370 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
+4 -4
View File
@@ -80,7 +80,7 @@
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
<f:RenderField Width="80px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
@@ -98,13 +98,13 @@
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
<f:RenderField Width="80px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
FieldType="String" HeaderText="专业代码" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
<f:RenderField Width="100px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
@@ -274,7 +274,7 @@
Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
Hidden="true" ConfirmText="重置选中行费用信息？" ConfirmTarget="Parent" runat="server" Text="重置">
</f:MenuButton>
</f:Menu>
</form>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
+1 -1
View File
@@ -202,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(rowID);
if (model != null)
{
BLL.PhtglContractTrackService.DeletePHTGL_ContractTrackById(rowID);
BLL.PhtglContractTrackService.RestSetComparison(rowID);
}
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+3 -3
View File
@@ -87,7 +87,7 @@
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
<f:RenderField Width="80px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
@@ -105,13 +105,13 @@
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
<f:RenderField Width="80px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
FieldType="String" HeaderText="专业代码" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
<f:RenderField Width="100px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+2 -1
View File
@@ -477,7 +477,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.Quantity = Quantity;
model.TotalCostFixedComprehensiveUnitPrice =Funs.GetNewDecimalOrZero( TotalCostFixedComprehensiveUnitPrice);
model.MainMaterialCost = Funs.GetNewDecimalOrZero(MainMaterialCost);
model.TotalPrice = Funs.GetNewDecimalOrZero(TotalPrice);
// model.TotalPrice = Funs.GetNewDecimalOrZero(TotalPrice);
model.TotalPrice = (Funs.GetNewDecimalOrZero(Quantity)* model.TotalCostFixedComprehensiveUnitPrice);
model.CalculationRule = CalculationRule;
model.WorkContent = WorkContent;
model.Remarks = Remarks;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx
+3 -3
View File
@@ -18,14 +18,14 @@
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red {
background-color: Yellow;
}
.f-grid-cell[data-color=color1] {
background-color: Yellow;
color: #000000;
}
}
</style>
</head>
<body>
@@ -40,7 +40,7 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true"
AllowPaging="True" IsDatabasePaging="true" PageSize="300" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_OnRowDataBound"
AllowPaging="True" IsDatabasePaging="true" PageSize="50" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_OnRowDataBound"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="True" >
<Toolbars>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs
+70 -58
View File
@@ -1,13 +1,16 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
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
{
@@ -60,12 +63,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack();
queryContractTrack.ProjectId = this.CurrUser.LoginProjectId;
queryContractTrack.ContractId = this.ContractId;
var modelContractTracks = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack);
if (modelContractTracks.Count==0) return;
var modelContractTracks = BLL.PhtglContractTrackService.GetFirstPHTGL_ContractTrackByModle(queryContractTrack);
if (modelContractTracks==null) return;
Model.PHTGL_ContractTrackProgress table = new Model.PHTGL_ContractTrackProgress();
table.ContractTrackId = modelContractTracks[0].Id;
table.ContractTrackId = modelContractTracks.Id;
var tb = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(table);
foreach (var item in tb)
{
@@ -81,8 +84,8 @@ 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";
p1ACWP.TextAlign = TextAlign.Center;
@@ -97,7 +100,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
GroupField p2BCWS = new GroupField();
p2BCWS.HeaderText = "BCWS";
p2BCWS.TextAlign = TextAlign.Center;
p2BCWS.Attributes["data-color"] = "color1";
GroupField p2ACWP = new GroupField();
p2ACWP.HeaderText = "ACWP";
p2ACWP.TextAlign = TextAlign.Center;
@@ -254,10 +257,10 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Grid1.Columns.Add(p);
}
}
}
}
#endregion
public string ContractId
{
@@ -284,9 +287,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </summary>
private void BindGrid()
{
if (!string .IsNullOrEmpty(ContractId))
if (!string.IsNullOrEmpty(ContractId))
{
DataRow row;
Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack();
queryContractTrack.ProjectId = this.CurrUser.LoginProjectId;
queryContractTrack.ContractId = this.ContractId;
@@ -298,57 +300,72 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
var modelContractTracks =
BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack);
var count = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack).Count();
modelContractTracks= modelContractTracks.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize).ToList();
foreach (var item in modelContractTracks)
modelContractTracks = modelContractTracks.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize).ToList();
var splitContractTracks = Funs.SplitList(modelContractTracks, 10);
ParallelOptions parallelOptions = new ParallelOptions();
parallelOptions.MaxDegreeOfParallelism = Environment.ProcessorCount;
var concurrentGridTable = new ConcurrentDictionary<string, DataRow>();
// 使用 Parallel.ForEach 来并行处理拆分后的列表
Parallel.ForEach(splitContractTracks, parallelOptions, sublist =>
{
row= GridTable.NewRow();
row["Id"] = item.Id;
row["MainItemCode"] = item.MainItemCode;
row["MainItemName"] = item.MainItemName;
row["MajorName"] = item.MajorName;
row["MajorCode"] = item.MajorCode;
//row["SubProject"] = item.SubProject;
//row["SubItemProject"] = item.SubItemProject;
row["ProjectCode"] = item.ProjectCode;
row["ProjectName"] = item.ProjectName;
row["ProjectDescription"] = item.ProjectDescription;
row["UnitOfMeasurement"] = item.UnitOfMeasurement;
Model.PHTGL_ContractTrackProgress qContractTrackProgress = new Model.PHTGL_ContractTrackProgress();
qContractTrackProgress.ContractTrackId = item.Id;
var modelContractTrackProgresses = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(qContractTrackProgress);
foreach (var detail in modelContractTrackProgresses)
var tempTable = GridTable.Clone(); // 创建临时的 DataTable
foreach (var item in sublist)
{
// var date=detail.Date.Replace("-", "");
var date=detail.Date + "#";
row[date+ "BCWS_Quantity"] = detail.BCWS_Quantity;
row[date+ "BCWS_OutputValue"] = detail.BCWS_OutputValue;
row[date+ "BCWS_Percentage"] = detail.BCWS_Percentage;
row[date+ "ACWP_Quantity"] = detail.ACWP_Quantity;
row[date+ "ACWP_OutputValue"] = detail.ACWP_OutputValue;
row[date+ "ACWP_Percentage"] = detail.ACWP_Percentage;
DataRow row = tempTable.NewRow();
row["Id"] = item.Id;
row["MainItemCode"] = item.MainItemCode;
row["MainItemName"] = item.MainItemName;
row["MajorName"] = item.MajorName;
row["MajorCode"] = item.MajorCode;
//row["SubProject"] = item.SubProject;
//row["SubItemProject"] = item.SubItemProject;
row["ProjectCode"] = item.ProjectCode;
row["ProjectName"] = item.ProjectName;
row["ProjectDescription"] = item.ProjectDescription;
row["UnitOfMeasurement"] = item.UnitOfMeasurement;
var SumModel = PhtglContracttrackprogressService.GetSumProgress(detail.ContractTrackProgressId);
row[date + "SumBCWS_Quantity"] = SumModel.BCWS_Quantity;
row[date + "SumBCWS_OutputValue"] = SumModel.BCWS_OutputValue;
row[date + "SumBCWS_Percentage"] = SumModel.BCWS_Percentage;
row[date + "SumACWP_Quantity"] = SumModel.ACWP_Quantity;
row[date + "SumACWP_OutputValue"] = SumModel.ACWP_OutputValue;
row[date + "SumACWP_Percentage"] = SumModel.ACWP_Percentage;
Model.PHTGL_ContractTrackProgress qContractTrackProgress = new Model.PHTGL_ContractTrackProgress();
qContractTrackProgress.ContractTrackId = item.Id;
var modelContractTrackProgresses = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(qContractTrackProgress);
foreach (var detail in modelContractTrackProgresses)
{
// var date=detail.Date.Replace("-", "");
var date = detail.Date + "#";
row[date + "BCWS_Quantity"] = detail.BCWS_Quantity;
row[date + "BCWS_OutputValue"] = detail.BCWS_OutputValue;
row[date + "BCWS_Percentage"] = detail.BCWS_Percentage;
row[date + "ACWP_Quantity"] = detail.ACWP_Quantity;
row[date + "ACWP_OutputValue"] = detail.ACWP_OutputValue;
row[date + "ACWP_Percentage"] = detail.ACWP_Percentage;
var SumModel = PhtglContracttrackprogressService.GetSumProgress(detail.ContractTrackProgressId);
row[date + "SumBCWS_Quantity"] = SumModel.BCWS_Quantity;
row[date + "SumBCWS_OutputValue"] = SumModel.BCWS_OutputValue;
row[date + "SumBCWS_Percentage"] = SumModel.BCWS_Percentage;
row[date + "SumACWP_Quantity"] = SumModel.ACWP_Quantity;
row[date + "SumACWP_OutputValue"] = SumModel.ACWP_OutputValue;
row[date + "SumACWP_Percentage"] = SumModel.ACWP_Percentage;
}
concurrentGridTable.TryAdd(item.Id, row);
// GridTable.Rows.Add(row);
}
GridTable.Rows.Add(row);
});
// 将线程安全的数据拷贝到 GridTable
foreach (var kvp in concurrentGridTable)
{
DataRow newRow = GridTable.NewRow();
newRow.ItemArray = kvp.Value.ItemArray; // 使用 ImportRow 方法创建新的行
GridTable.Rows.Add(newRow);
}
Grid1.RecordCount = count;
Grid1.DataSource = GridTable;
Grid1.DataBind();
}
}
}
protected void Grid1_OnRowDataBound(object sender, GridRowEventArgs e)
{
if (!string.IsNullOrEmpty(ContractId))
@@ -357,7 +374,7 @@ 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 qContractTrackProgress = new Model.PHTGL_ContractTrackProgress();
qContractTrackProgress.ContractTrackId = modelContractTracks.Id;
var modelContractTrackProgresses = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(qContractTrackProgress);
@@ -381,13 +398,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
e.CellAttributes[bf3.ColumnIndex]["data-color"] = "color1";
e.CellAttributes[bf4.ColumnIndex]["data-color"] = "color1";
}
//foreach (var item in modelContractTracks)
//{
//}
}
}