lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2025-05-09 16:58:38 +08:00
parent e87f7f97ca
commit 491566bded
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx
View File

@ -59,7 +59,7 @@
<f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center" <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center" Width="110px"> HeaderTextAlign="Center" Width="110px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="NoticeCode" DataField="NoticeCode" FieldType="String" HeaderText="共检通知单编号" TextAlign="Center" <f:RenderField ColumnID="NoticeCode" DataField="NoticeCode" SortField="NoticeCode" FieldType="String" HeaderText="共检通知单编号" TextAlign="Center"
HeaderTextAlign="Center" Width="130px"> HeaderTextAlign="Center" Width="130px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="AcceptanceSite" DataField="AcceptanceSite" FieldType="String" HeaderText="验收部位" TextAlign="Center" <f:RenderField ColumnID="AcceptanceSite" DataField="AcceptanceSite" FieldType="String" HeaderText="验收部位" TextAlign="Center"
@ -79,7 +79,7 @@
<f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报检编号" TextAlign="Center" <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报检编号" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center" <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" SortField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField> </f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left"> <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">

14
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -4,6 +4,7 @@ using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage; using FineUIPro.Web.SysManage;
using Model; using Model;
using Newtonsoft.Json; using Newtonsoft.Json;
using NPOI.HSSF.Record;
using NPOI.Util; using NPOI.Util;
using System; using System;
using System.Collections; using System.Collections;
@ -938,22 +939,19 @@ namespace FineUIPro.Web.common
// } // }
// } // }
var ndtList = var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProjectId == ProjectId select x).ToList();
(from x in db.ProcessControl_NondestructiveTest_New
where x.ProjectId == ProjectId
select x).ToList();
decimal a = 0, b = 0; decimal a = 0, b = 0;
if (ndtList.Count > 0) if (ndtList.Count > 0)
{ {
foreach (var item in ndtList) //取每个单位最新的一条数据
var datalist = ndtList.GroupBy(r => r.UnitId).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var item in datalist)
{ {
if (item.TotalQuantity.HasValue) if (item.TotalQuantity.HasValue)
{ {
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
100);
b += item.TotalQuantity.Value; b += item.TotalQuantity.Value;
} }
} }
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a); result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
} }