diff --git a/SGGL/FineUIPro.Web/common/mainIV.aspx b/SGGL/FineUIPro.Web/common/mainIV.aspx
index 02380ab5..c5a362d1 100644
--- a/SGGL/FineUIPro.Web/common/mainIV.aspx
+++ b/SGGL/FineUIPro.Web/common/mainIV.aspx
@@ -332,6 +332,11 @@
+
+
+
+
+
@@ -929,9 +942,17 @@
} else if (index == 2) {
$('#divGZL').html($('#hdMaterialRecords')[0].value);
} else if (index == 4) {
-
+ $('#divGZL').html($('#hdTotalQuantity')[0].value);
} else if (index == 6) {
-
+ $('#divGZL').html($('#hdQuantity')[0].value);
+ } else if (index == 8) {
+ $('#divGZL').html($('#hdOneOKRate')[0].value);
+ } else if (index == 10) {
+ $('#divGZL').html($('#hdPressurePackageList')[0].value);
+ } else if (index == 12) {
+ $('#divGZL').html($('#hdNdtList')[0].value);
+ } else if (index == 14) {
+ $('#divGZL').html($('#hdTailItemList')[0].value);
}
}
})
diff --git a/SGGL/FineUIPro.Web/common/mainIV.aspx.cs b/SGGL/FineUIPro.Web/common/mainIV.aspx.cs
index ffda8ea0..d5e392c3 100644
--- a/SGGL/FineUIPro.Web/common/mainIV.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainIV.aspx.cs
@@ -169,6 +169,153 @@ namespace FineUIPro.Web.common
}
}
this.hdMaterialRecords.Value = materialRecordsStr;
+ //项目管道焊接工程量
+ string totalQuantityStr = string.Empty;
+ var totalQuantitys = from x in db.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceCode select x;
+ if (totalQuantitys.Count() > 0)
+ {
+ totalQuantityStr = "
";
+ int i = 1;
+ foreach (var item in totalQuantitys)
+ {
+ totalQuantityStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceCode + "
"
+ + item.Unit + "
"
+ + item.TotalWeldQuantity + "
"
+ + item.TotalCompleted + "
";
+ i++;
+ }
+ }
+ this.hdTotalQuantity.Value = totalQuantityStr;
+ //焊接工程量表
+ string quantityStr = string.Empty;
+ var quantitys = from x in db.HJGL_FL_Quantity where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber, x.ZoneNumber select x;
+ if (quantitys.Count() > 0)
+ {
+ quantityStr = "
序号
装置名称
装置号
施工单位
区域号
焊接完成量
已完成量
昨日完成量
周计划量
周完成量
";
+ int i = 1;
+ foreach (var item in quantitys)
+ {
+ quantityStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceNumber + "
"
+ + item.UnitName + "
"
+ + item.ZoneNumber + "
"
+ + item.InchesDiameterTotal + "
"
+ + item.InchesDiameterFinish + "
"
+ + item.YesterdayFinish + "
"
+ + item.WeekInchesDiameterPlan + "
"
+ + item.WeekInchesDiameterFinish + "
";
+ i++;
+ }
+ }
+ this.hdQuantity.Value = quantityStr;
+ //无损检测一次合格率
+ string oneOKRateStr = string.Empty;
+ var oneOKRates = from x in db.HJGL_FL_OneOKRate where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceCode, x.ZoneCode select x;
+ if (oneOKRates.Count() > 0)
+ {
+ oneOKRateStr = "
序号
装置名称
装置号
单元号
施工单位
检测焊口数量
一次合格数量
一次检测合格率
一次拍片总量
一次拍片合格量
一次拍片合格率
";
+ int i = 1;
+ foreach (var item in oneOKRates)
+ {
+ oneOKRateStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceCode + "
"
+ + item.ZoneCode + "
"
+ + item.UnitName + "
"
+ + item.TestWeldAmount + "
"
+ + item.OnceQualifiedQuantity + "
"
+ + item.OneOKRate + "
"
+ + item.OneTimeFilmAmount + "
"
+ + item.OneTimeFilmQualifiedAmount + "
"
+ + item.OneOKFilmRate + "
";
+ i++;
+ }
+ }
+ this.hdOneOKRate.Value = oneOKRateStr;
+ //试压包量表
+ string pressurePackageListStr = string.Empty;
+ var pressurePackageLists = from x in db.HJGL_FL_PressurePackageList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber select x;
+ if (pressurePackageLists.Count() > 0)
+ {
+ pressurePackageListStr = "
序号
装置名称
装置号
施工单位
试压包总量
试压包完成量
水压包总量
水压包完成量
观察包总量
观察包完成量
运行包总量
运行包完成量
替代包总量
替代包完成量
";
+ int i = 1;
+ foreach (var item in pressurePackageLists)
+ {
+ pressurePackageListStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceNumber + "
"
+ + item.UnitName + "
"
+ + item.PressurePackageTotalNum + "
"
+ + item.CompletePressurePackageNum + "
"
+ + item.WaterPressurePackageTotalNum + "
"
+ + item.CompleteWaterPressurePackageCompleteNum + "
"
+ + item.ObservePackageTotalNum + "
"
+ + item.CompleteObservePackageNum + "
"
+ + item.RunPackageTotalNum + "
"
+ + item.CompleteRunPackageNum + "
"
+ + item.AlternativePackageTotalNum + "
"
+ + item.CompleteAlternativePackageNum + "
";
+ i++;
+ }
+ }
+ this.hdPressurePackageList.Value = pressurePackageListStr;
+ //无损检测量表
+ string ndtListStr = string.Empty;
+ var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber, x.ZoneCode select x;
+ if (ndtLists.Count() > 0)
+ {
+ ndtListStr = "
序号
装置名称
装置号
单元号
施工单位
理论检测焊口总量
检测焊口数量
一次合格数量
一次拍片总量
一次拍片合格量
";
+ int i = 1;
+ foreach (var item in ndtLists)
+ {
+ ndtListStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceNumber + "
"
+ + item.ZoneCode + "
"
+ + item.UnitName + "
"
+ + item.TheoreticalWeldedJointsTotal + "
"
+ + item.TestWeldAmount + "
"
+ + item.OnceQualifiedQuantity + "
"
+ + item.OneTimeFilmAmount + "
"
+ + item.OneTimeFilmQualifiedAmount + "
";
+ i++;
+ }
+ }
+ this.hdNdtList.Value = ndtListStr;
+ //无损检测量表
+ string tailItemListStr = string.Empty;
+ var tailItemLists = from x in db.HJGL_FL_TailItemList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber select x;
+ if (tailItemLists.Count() > 0)
+ {
+ tailItemListStr = "
序号
装置名称
装置号
施工单位
剩余焊接焊口数
热处理数
硬度检测数
无损检测对接未完数
无损检测角接未完数
无损检测支管未完数
现场检查A类
现场检查B类
";
+ int i = 1;
+ foreach (var item in tailItemLists)
+ {
+ tailItemListStr += "
"
+ + i + "
"
+ + item.DeviceName + "
"
+ + item.DeviceNumber + "
"
+ + item.UnitName + "
"
+ + item.RemainingWeldsNumber + "
"
+ + item.HeatTreatmentsNumber + "
"
+ + item.HardnessTestsNumber + "
"
+ + item.UnfinishedButtNumber + "
"
+ + item.UnfinishedCornerJointNumber + "
"
+ + item.UnfinishedBranchPipeNumber + "
"
+ + item.ClassAQuantity + "
"
+ + item.ClassBQuantity + "
";
+ i++;
+ }
+ }
+ this.hdTailItemList.Value = tailItemListStr;
}
}