试压看板增加排序和单位工程的试压包完成率
This commit is contained in:
@@ -76,34 +76,30 @@
|
||||
runat="server" BoxFlex="1" DataKeyNames="PTP_ID" AllowCellEditing="true"
|
||||
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PTP_ID" AllowSorting="true"
|
||||
SortField="TestPackageNo" SortDirection="ASC" EnableTextSelection="True"
|
||||
AllowPaging="true" IsDatabasePaging="false" PageSize="20" ForceFit="true">
|
||||
AllowPaging="true" IsDatabasePaging="false" PageSize="20" ForceFit="true">
|
||||
<Columns>
|
||||
<f:RenderField HeaderText="单位工程" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="试压包号" ColumnID="TestPackageNo" DataField="TestPackageNo" SortField="TestPackageNo"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:CheckBoxField RenderAsStaticField="true" DataField="CanPressureTest" HeaderText="是否具备试压条件" Width="120px" />
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="检测完成百分比" ColumnID="DetectionCompletionPercent" DataField="DetectionCompletionPercent" SortField="DetectionCompletionPercent"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊口完成百分比" ColumnID="WeldCompletionPercent" DataField="WeldCompletionPercent" SortField="WeldCompletionPercent"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="具备程度比值" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="状态" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="已完成百分比" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="是否具备试压条件" ColumnID="CanPressureTest" DataField="CanPressureTest" SortField="CanPressureTest"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="单位工程已完成百分比" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="具备程度比值" ColumnID="PipelinePassPercent" DataField="PipelinePassPercent" SortField="PipelinePassPercent"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:Grid>
|
||||
|
||||
</Items>
|
||||
|
||||
@@ -197,15 +197,16 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
|
||||
//}
|
||||
|
||||
var dicUnitWorkTestPackagePassPercent= BLL.TestPackageEditService.GetTestPackagePassPercentByProjectId(this.CurrUser.LoginProjectId);
|
||||
if (unitWork1.Count() > 0)
|
||||
{
|
||||
foreach (var q in unitWork1)
|
||||
{
|
||||
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
|
||||
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
|
||||
TreeNode tn1 = new TreeNode();
|
||||
var unitWorkTestPackagePassPercent = dicUnitWorkTestPackagePassPercent.TryGetValue(q.UnitWorkId, out var value) ? value : 0;
|
||||
TreeNode tn1 = new TreeNode();
|
||||
tn1.NodeID = q.UnitWorkId;
|
||||
tn1.Text = q.UnitWorkName;
|
||||
tn1.Text = q.UnitWorkName+"(已完成"+ unitWorkTestPackagePassPercent+"%)";
|
||||
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
|
||||
tn1.CommandName = "单位工程";
|
||||
rootNode1.Nodes.Add(tn1);
|
||||
@@ -217,11 +218,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
{
|
||||
foreach (var q in unitWork2)
|
||||
{
|
||||
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
|
||||
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
|
||||
var unitWorkTestPackagePassPercent = dicUnitWorkTestPackagePassPercent.TryGetValue(q.UnitWorkId, out var value) ? value : 0;
|
||||
|
||||
TreeNode tn2 = new TreeNode();
|
||||
tn2.NodeID = q.UnitWorkId;
|
||||
tn2.Text = q.UnitWorkName;
|
||||
tn2.Text = q.UnitWorkName + "(已完成" + unitWorkTestPackagePassPercent + "%)";
|
||||
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
|
||||
tn2.CommandName = "单位工程";
|
||||
rootNode2.Nodes.Add(tn2);
|
||||
@@ -342,6 +344,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var analyze = BLL.TestPackageEditService.getTestPackageAnalyze(pkg.PTP_ID, pkg.ProjectId);
|
||||
analyzeList.Add(analyze);
|
||||
}
|
||||
analyzeList = analyzeList.OrderBy(x => x.UnitWorkName).ThenBy(x => x.TestPackageNo).ToList();
|
||||
// 绑定到Grid1
|
||||
Grid2.RecordCount = analyzeList.Count;
|
||||
Grid2.DataSource = analyzeList;
|
||||
|
||||
@@ -253,7 +253,6 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
return;
|
||||
}
|
||||
Dictionary<string, string> printFiles = new Dictionary<string, string>();
|
||||
|
||||
foreach (var ptp_id in selectedRows)
|
||||
{
|
||||
var item = exportWord(ptp_id);
|
||||
@@ -262,6 +261,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
}
|
||||
if (printFiles.Count>1)
|
||||
{
|
||||
string zipName = "";
|
||||
string rootPath = Funs.RootPath;
|
||||
string startPath = rootPath + "FileUpload\\试压包资料" + DateTime.Now.GetHashCode();
|
||||
if (!Directory.Exists(startPath))
|
||||
@@ -273,18 +273,20 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
{
|
||||
var sourceFile = item.Key;
|
||||
var destFile = startPath + "\\" + item.Value;
|
||||
zipName+= item.Value.Replace(".pdf","")+"," ;
|
||||
if (File.Exists(sourceFile))
|
||||
{
|
||||
File.Copy(sourceFile, destFile, true);
|
||||
File.Delete(sourceFile);
|
||||
}
|
||||
}
|
||||
zipName= zipName.TrimEnd(',');
|
||||
System.IO.Compression.ZipFile.CreateFromDirectory(startPath, zipPath);
|
||||
FileInfo info = new FileInfo(zipPath);
|
||||
long fileSize = info.Length;
|
||||
System.Web.HttpContext.Current.Response.Clear();
|
||||
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("试压包资料.zip", System.Text.Encoding.UTF8));
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(zipName+".zip", System.Text.Encoding.UTF8));
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
|
||||
System.Web.HttpContext.Current.Response.TransmitFile(zipPath, 0, fileSize);
|
||||
System.Web.HttpContext.Current.Response.Flush();
|
||||
|
||||
Reference in New Issue
Block a user