20250329 工作台
This commit is contained in:
@@ -1,7 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="17479694-E342-4046-807A-8905C3B225C1" Text="材料管理" NavigateUrl="">
|
||||
<TreeNode id="C0C5E48B-4C0D-4657-92AB-25DF0FEE372F" Text="设计请购一览表" NavigateUrl="">
|
||||
<TreeNode id="484E50BA-B6F2-47E0-BB7C-B1C27965E087" Text="合同清单一览表" NavigateUrl="CLGL/ContractList.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="F0F43F1C-0E73-4A7C-AE43-26950D8D93E4" Text="合同清单汇总表" NavigateUrl="CLGL/ContractListSum.aspx"></TreeNode>
|
||||
<TreeNode id="55301756-3313-4876-A1C3-2D1246C4B93C" Text="管道材料状态一览表" NavigateUrl="CLGL/PipelineMaterialList.aspx"></TreeNode>
|
||||
<TreeNode id="074B06B2-456A-4F7B-8E40-00F379C6E302" Text="管道材料编码统计一览表" NavigateUrl="CLGL/PipelineMaterialCodeList.aspx"></TreeNode>
|
||||
<TreeNode id="AF7EA0E4-92A1-4F8D-A5A0-99B0084F7C75" Text="管道供货商概要一览表" NavigateUrl="CLGL/PipelineSupplierList.aspx"></TreeNode>
|
||||
<TreeNode id="8BBFA90C-1F1C-4587-AA94-BE44C5075CBD" Text="MTO明细信息一览表" NavigateUrl="CLGL/MTODetail.aspx"></TreeNode>
|
||||
<TreeNode id="44527C92-FF92-4935-B81E-F6C8B8C4D622" Text="管道材料汇总表" NavigateUrl="CLGL/PipelineMaterialSumList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9F944625-2EA3-46A1-8D18-A882CE88F3A5" Text="现场请购到货及出库一览表" NavigateUrl=""><TreeNode id="7D4E3B4D-76FE-41FB-B2F2-23A0D252D4E4" Text="现场请购明细一览表" NavigateUrl="CLGL/RequestDetailList.aspx"></TreeNode>
|
||||
<TreeNode id="31134149-CE94-49FD-A1D9-5A70553FAC61" Text="现场到货明细一览表" NavigateUrl="CLGL/ArrivalDetailList.aspx"></TreeNode>
|
||||
<TreeNode id="3C30E38D-0BE9-4295-AF70-73D52F7FC4BC" Text="现场出库明细一览表" NavigateUrl="CLGL/CheckOutDetailList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9669E903-C7DD-4E48-8962-B22A7B4972E6" Text="其他" NavigateUrl=""><TreeNode id="414F9650-37F8-4B20-A2BB-EBBD4F620E49" Text="货架信息" NavigateUrl="CLGL/GoodsShelves.aspx"></TreeNode>
|
||||
<TreeNode id="4B52E7FF-AA04-489B-B0EE-DC31C5C4F45B" Text="施工单位信息" NavigateUrl="CLGL/SubUnit.aspx"></TreeNode>
|
||||
<TreeNode id="43A118BC-0A81-42F1-B008-829D40CFE625" Text="供应商信息" NavigateUrl="CLGL/Supplier.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
|
||||
<TreeNode id="82E1EB3B-3589-4C32-9C20-40125CE6EAB4" Text="设备材料分类" NavigateUrl=""><TreeNode id="F2BC1293-8639-4BD6-8759-648BCF6346E9" Text="设备材料大类" NavigateUrl="JDGL/WBS/EquipmentMaterialBigType.aspx"></TreeNode>
|
||||
<TreeNode id="D00B3C53-2972-4D24-B88F-B38880D4A24F" Text="设备材料分类" NavigateUrl="JDGL/WBS/EquipmentMaterialType.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
|
||||
@@ -66,6 +66,22 @@
|
||||
<TreeNode id="04E072D1-5BD3-4F6C-9E81-1FE32A4851E9" Text="仪表调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=8"></TreeNode>
|
||||
<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D98BB86C-CCC4-433B-B367-EFD9E7D2BC39" Text="移交管理" NavigateUrl=""><TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0"></TreeNode>
|
||||
<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
|
||||
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
|
||||
<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
|
||||
<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
|
||||
<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
|
||||
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
|
||||
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
|
||||
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
|
||||
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
|
||||
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
|
||||
<TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
|
||||
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
|
||||
|
||||
@@ -1,19 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
|
||||
</TreeNode>
|
||||
<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
|
||||
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
|
||||
<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
|
||||
<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
|
||||
<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
|
||||
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
|
||||
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
|
||||
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
|
||||
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
|
||||
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
|
||||
</Tree>
|
||||
@@ -393,6 +393,9 @@
|
||||
<div class="jdtj-btn jdtj-btn-act" id="span_jdtj" onclick="jdtjOnclick(0)" style="cursor: pointer">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ProgressStatistics %>" />
|
||||
</div>
|
||||
<div class="jdtj-btn" onclick="jdtjOnclick(3)" id="span_quantityDoneJdtj" style="cursor: pointer">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_QuantityDone %>" />
|
||||
</div>
|
||||
<div class="jdtj-btn" onclick="jdtjOnclick(1)" id="span_weekJdtj" style="cursor: pointer">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_WeekPlanDone %>" />
|
||||
</div>
|
||||
@@ -698,6 +701,7 @@
|
||||
function jdtjOnclick(objval) {
|
||||
if (objval == 1) {
|
||||
$("#span_jdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_weekJdtj").addClass("jdtj-btn-act");
|
||||
$("#span_monthJdtj").removeClass("jdtj-btn-act");
|
||||
$("#jdtj-content").show();
|
||||
@@ -706,14 +710,25 @@
|
||||
$("#div_jdtjList").html('<%=WeekJdtjHtml%>');
|
||||
} else if (objval == 2) {
|
||||
$("#span_jdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_weekJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_monthJdtj").addClass("jdtj-btn-act");
|
||||
$("#jdtj-content").show();
|
||||
$("#left_one").hide();
|
||||
$("#div_jdtjHead").html('<%=MonthJdtjHead%>');
|
||||
$("#div_jdtjList").html('<%=MonthJdtjHtml%>');
|
||||
} else if (objval == 3) {
|
||||
$("#span_jdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_quantityDoneJdtj").addClass("jdtj-btn-act");
|
||||
$("#span_weekJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_monthJdtj").removeClass("jdtj-btn-act");
|
||||
$("#jdtj-content").show();
|
||||
$("#left_one").hide();
|
||||
$("#div_jdtjHead").html('<%=QuantityDoneJdtjHead%>');
|
||||
$("#div_jdtjList").html('<%=QuantityDoneJdtjHtml%>');
|
||||
} else {
|
||||
$("#span_jdtj").addClass("jdtj-btn-act");
|
||||
$("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_weekJdtj").removeClass("jdtj-btn-act");
|
||||
$("#span_monthJdtj").removeClass("jdtj-btn-act");
|
||||
$("#jdtj-content").hide();
|
||||
@@ -2124,8 +2139,8 @@
|
||||
const list = [
|
||||
{ TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> },
|
||||
{ TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> },
|
||||
{ TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> },
|
||||
{ TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> },
|
||||
{ TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData2%> },
|
||||
{ TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData3%> },
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -109,6 +109,7 @@ namespace FineUIPro.Web.common
|
||||
var personTask = GetPersonAsync();
|
||||
var weekJdtjTask = GetWeekJDAsync();
|
||||
var monthJdtjTask = GetMonthJDAsync();
|
||||
var quantityDoneJDTask = GetQuantityDoneJDAsync();
|
||||
var otherTasks = new List<Task>
|
||||
{
|
||||
BindSafetyStatisticsAsync(), // 安全统计模块
|
||||
@@ -148,13 +149,14 @@ namespace FineUIPro.Web.common
|
||||
|
||||
getCNEN(),//中英文翻译
|
||||
};
|
||||
await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask }));
|
||||
await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask, weekJdtjTask, monthJdtjTask, quantityDoneJDTask }));
|
||||
|
||||
Tree = await treeTask;
|
||||
Person = await personTask;
|
||||
|
||||
WeekJdtjHtml = await weekJdtjTask;
|
||||
MonthJdtjHtml = await monthJdtjTask;
|
||||
QuantityDoneJdtjHtml = await quantityDoneJDTask;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -475,7 +477,7 @@ namespace FineUIPro.Web.common
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId);
|
||||
var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId);
|
||||
return result;
|
||||
});
|
||||
}
|
||||
@@ -553,7 +555,7 @@ namespace FineUIPro.Web.common
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId);
|
||||
var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId);
|
||||
return result;
|
||||
});
|
||||
}
|
||||
@@ -901,25 +903,62 @@ namespace FineUIPro.Web.common
|
||||
List<double> listdata = new List<double>();
|
||||
double result = 0;
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
// var ndtList =
|
||||
// (from x in db.ProcessControl_NondestructiveTest_New
|
||||
// where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
|
||||
// orderby x.CreateDate descending
|
||||
// select x).FirstOrDefault();
|
||||
// decimal a = 0, b = 0;
|
||||
// if (ndtList != null)
|
||||
// {
|
||||
// if (ndtList.TotalQuantity.HasValue)
|
||||
// {
|
||||
// a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
|
||||
// 100);
|
||||
// b += ndtList.TotalQuantity.Value;
|
||||
// }
|
||||
//
|
||||
// if (!string.IsNullOrEmpty(ndtList.TotalRate))
|
||||
// {
|
||||
// result = Convert.ToDouble(ndtList.TotalRate);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// var hjglData =
|
||||
// (from x in db.HJGL_FL_Data
|
||||
// where x.ProjectId == ProjectId
|
||||
// orderby x.CompileDate descending
|
||||
// select x).FirstOrDefault();
|
||||
// if (hjglData != null)
|
||||
// {
|
||||
// a = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmQualifiedAmount);
|
||||
// b = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmAmount);
|
||||
// if (a > 0 && b > 0)
|
||||
// {
|
||||
// result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
var ndtList =
|
||||
(from x in db.ProcessControl_NondestructiveTest_New
|
||||
where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
|
||||
orderby x.CreateDate descending
|
||||
select x).FirstOrDefault();
|
||||
where x.ProjectId == ProjectId
|
||||
select x).ToList();
|
||||
decimal a = 0, b = 0;
|
||||
if (ndtList != null)
|
||||
if (ndtList.Count > 0)
|
||||
{
|
||||
if (ndtList.TotalQuantity.HasValue)
|
||||
foreach (var item in ndtList)
|
||||
{
|
||||
a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
|
||||
100);
|
||||
b += ndtList.TotalQuantity.Value;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(ndtList.TotalRate))
|
||||
{
|
||||
result = Convert.ToDouble(ndtList.TotalRate);
|
||||
if (item.TotalQuantity.HasValue)
|
||||
{
|
||||
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) /
|
||||
100);
|
||||
b += item.TotalQuantity.Value;
|
||||
}
|
||||
|
||||
}
|
||||
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -938,7 +977,8 @@ namespace FineUIPro.Web.common
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (b > 0)
|
||||
{
|
||||
hjallNumber = b.ToString();
|
||||
@@ -1187,6 +1227,91 @@ namespace FineUIPro.Web.common
|
||||
|
||||
#endregion 赢得值曲线
|
||||
|
||||
|
||||
#region 工程量完成情况
|
||||
|
||||
protected string QuantityDoneJdtjHtml;
|
||||
protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
|
||||
//protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >单位</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
|
||||
|
||||
/// <summary>
|
||||
/// 工程量完成情况
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected async Task<string> GetQuantityDoneJDAsync()
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
string doneJdtjHtml = string.Empty;
|
||||
string month = string.Format("{0:yyyy-MM-01}", DateTime.Now);
|
||||
//DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
|
||||
if (DateTime.Now.Day < 26)
|
||||
{
|
||||
month = string.Format("{0:yyyy-MM-01}", DateTime.Now.AddMonths(-1));
|
||||
//months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
|
||||
}
|
||||
string strSql = @"select qc.QuantityCompletionId,(select PlanNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum,
|
||||
(select RealNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as RealNum,
|
||||
(select NextNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
|
||||
CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum,
|
||||
CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum,
|
||||
CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0
|
||||
|
||||
ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%'
|
||||
|
||||
AS Rate,
|
||||
CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0
|
||||
|
||||
ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%'
|
||||
|
||||
AS TotalRate,
|
||||
CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0
|
||||
ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%'
|
||||
|
||||
AS SumRate,
|
||||
CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum,
|
||||
CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum
|
||||
from[dbo].JDGL_QuantityList ql
|
||||
left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
|
||||
where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name";
|
||||
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
listStr.Add(new SqlParameter("@month", month));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int j = 0; j < tb.Rows.Count; j++)
|
||||
{
|
||||
string name = tb.Rows[j]["Name"].ToString().Trim();
|
||||
string unit = tb.Rows[j]["Unit"].ToString().Trim();
|
||||
string designNum = Funs.RemoveZero(tb.Rows[j]["DesignNum"].ToString().Trim());
|
||||
string planNum = Funs.RemoveZero(tb.Rows[j]["PlanNum"].ToString().Trim());
|
||||
string realNum = Funs.RemoveZero(tb.Rows[j]["RealNum"].ToString().Trim());
|
||||
string rate = tb.Rows[j]["Rate"].ToString().Trim();
|
||||
string nextNum = Funs.RemoveZero(tb.Rows[j]["NextNum"].ToString().Trim());
|
||||
string totalPlanNum = Funs.RemoveZero(tb.Rows[j]["TotalPlanNum"].ToString().Trim());
|
||||
string totalRealNum = Funs.RemoveZero(tb.Rows[j]["TotalRealNum"].ToString().Trim());
|
||||
string totalRate = tb.Rows[j]["TotalRate"].ToString().Trim();
|
||||
string sumRate = tb.Rows[j]["SumRate"].ToString().Trim();
|
||||
sb.Append("<div class=\"row\">");
|
||||
sb.Append($"<div class=\"tr\" >{name}（{unit}）</div>");
|
||||
//sb.Append($"<div class=\"tr\" >{unit}</div>");
|
||||
sb.Append($"<div class=\"tr\" >{designNum}</div>");
|
||||
sb.Append($"<div class=\"tr\" ><p><span>{planNum}</span><span>{realNum}</span><span>{rate}</span></p></div>");
|
||||
sb.Append($"<div class=\"tr\" ><p><span>{totalPlanNum}</span><span>{totalRealNum}</span><span>{totalRate}</span></p></div>");
|
||||
sb.Append($"<div class=\"tr\" >{sumRate}</div>");
|
||||
sb.Append("</div>");
|
||||
}
|
||||
doneJdtjHtml = sb.ToString();
|
||||
return doneJdtjHtml;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region 进度统计
|
||||
|
||||
protected string WeekJdtjHtml;
|
||||
@@ -1206,10 +1331,8 @@ namespace FineUIPro.Web.common
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
string weekGridHtml = string.Empty;
|
||||
//获取当前时间所在周信息
|
||||
//获取当前时间上一个周计划信息
|
||||
var lastWeek = WeekPlanService.GetLastWeekPlan(this.CurrUser.LoginProjectId);
|
||||
////根据当前时间获取上一个周计划信息
|
||||
//var lastWeekItem = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId);
|
||||
if (lastWeek != null)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
@@ -1534,7 +1657,7 @@ namespace FineUIPro.Web.common
|
||||
|
||||
SqlParameter[] Staticparameter = listStaticListStr.ToArray();
|
||||
DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
|
||||
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x;
|
||||
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId && x.State!="1" select x;
|
||||
var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
|
||||
var closecount = list.Count(x => x.State == "0");
|
||||
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
|
||||
@@ -1624,7 +1747,7 @@ namespace FineUIPro.Web.common
|
||||
}
|
||||
|
||||
//设备材料
|
||||
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
|
||||
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "管道" && x.ProjectId == pid);
|
||||
foreach (var item in SbclList)
|
||||
{
|
||||
sbclHtml += "<div class=\"row\">";
|
||||
|
||||
@@ -173,7 +173,29 @@ namespace FineUIPro.Web.common
|
||||
.SelectMany(x => x.persons.DefaultIfEmpty(),
|
||||
(x, person) => new { x.post, person })
|
||||
.Where(x => pids.Contains(x.person.ProjectId));
|
||||
divCqmsManageNum.InnerText = qualityQuery.Count().ToString();
|
||||
|
||||
//企业总部人员和分支机构人员
|
||||
var query = (from person in db.Person_CompanyBranchPerson
|
||||
join unit in db.Base_Unit on person.UnitId equals unit.UnitId into unitJoin
|
||||
from unit in unitJoin.DefaultIfEmpty() // 左连接
|
||||
join workPost in db.Base_WorkPost on person.WorkPostId equals workPost.WorkPostId into workPostJoin
|
||||
from workPost in workPostJoin.DefaultIfEmpty() // 左连接
|
||||
where person.IsOnJob == true && workPost.IsCQMS == true
|
||||
select new
|
||||
{
|
||||
ID = person.CompanyBranchPersonId,
|
||||
UnitName = unit.UnitName,
|
||||
PersonName = person.PersonName,
|
||||
SexStr = person.Sex == "1" ? "男" : "女",
|
||||
IdentityCard = person.IdentityCard,
|
||||
WorkPostName = workPost.WorkPostName,
|
||||
Telephone = person.Telephone,
|
||||
IsOnJob = person.IsOnJob,
|
||||
Remark = person.Remark,
|
||||
ProjectName = ""
|
||||
}).ToList();
|
||||
|
||||
divCqmsManageNum.InnerText = (qualityQuery.Count() + query.Count()).ToString();
|
||||
// 质量培训人员
|
||||
divCqmsPxNum.InnerText = db.Comprehensive_InspectionPerson
|
||||
.Where(x => pids.Contains(x.ProjectId))
|
||||
@@ -674,16 +696,15 @@ namespace FineUIPro.Web.common
|
||||
if (pids == null)
|
||||
{
|
||||
zlallNumber = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now
|
||||
select x).Count().ToString();
|
||||
|
||||
var num2 = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.State == "7"
|
||||
where x.State == "7"
|
||||
select x).Count();
|
||||
|
||||
zlfinishNumber = num2.ToString();
|
||||
var num3 = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.State != "7"
|
||||
where x.State != "7"
|
||||
select x).Count();
|
||||
|
||||
var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
|
||||
@@ -695,16 +716,16 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
zlallNumber = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
|
||||
where pids.Contains(x.ProjectId)
|
||||
select x).Count().ToString();
|
||||
|
||||
var num2 = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
|
||||
where x.State == "7" && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
|
||||
zlfinishNumber = num2.ToString();
|
||||
var num3 = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
|
||||
where x.State != "7" && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
|
||||
var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
|
||||
@@ -778,7 +799,7 @@ namespace FineUIPro.Web.common
|
||||
List<double> listdata = new List<double>();
|
||||
double result = 0;
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
|
||||
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x;
|
||||
if (pids != null)
|
||||
{
|
||||
ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId));
|
||||
@@ -826,17 +847,17 @@ namespace FineUIPro.Web.common
|
||||
{
|
||||
if (pids == null)
|
||||
{
|
||||
var znum = (from x in Funs.DB.GJSX select x).Count();
|
||||
var znum = (from x in Funs.DB.GJSX where x.State != "1" select x).Count();
|
||||
divGjsxzj.InnerHtml = znum.ToString();
|
||||
|
||||
var dqnum = (from x in Funs.DB.GJSX
|
||||
where x.CompleteDate <= DateTime.Now
|
||||
where x.CompleteDate <= DateTime.Now && x.State != "1"
|
||||
select x).Count().ToString();
|
||||
divGjsxdq.InnerHtml = dqnum;
|
||||
|
||||
var wzdnum = (from x in Funs.DB.GJSX
|
||||
where x.CompleteDate <= DateTime.Now
|
||||
&& x.State != "0"
|
||||
&& x.State != "0" && x.State != "1"
|
||||
select x).Count().ToString();
|
||||
divGjsxwzd.InnerHtml = wzdnum;
|
||||
|
||||
@@ -849,18 +870,18 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
var znum = (from x in Funs.DB.GJSX
|
||||
where pids.Contains(x.ProjectId)
|
||||
where pids.Contains(x.ProjectId) && x.State != "1"
|
||||
select x).Count();
|
||||
divGjsxzj.InnerHtml = znum.ToString();
|
||||
|
||||
var dqnum = (from x in Funs.DB.GJSX
|
||||
where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId)
|
||||
where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) && x.State != "1"
|
||||
select x).Count().ToString();
|
||||
divGjsxdq.InnerHtml = dqnum;
|
||||
|
||||
var wzdnum = (from x in Funs.DB.GJSX
|
||||
where x.CompleteDate <= DateTime.Now
|
||||
&& x.State != "0" && pids.Contains(x.ProjectId)
|
||||
&& x.State != "0" && pids.Contains(x.ProjectId) && x.State != "1"
|
||||
select x).Count().ToString();
|
||||
divGjsxwzd.InnerHtml = wzdnum;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user