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

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

@ -9,7 +9,7 @@
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1"/> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items> <Items>
@ -59,13 +59,13 @@
<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"
HeaderTextAlign="Center" Width="150px"> HeaderTextAlign="Center" Width="150px">
</f:RenderField> </f:RenderField>
<%-- <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center" <%-- <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
HeaderTextAlign="Center" Width="120px"> HeaderTextAlign="Center" Width="120px">
</f:RenderField>--%> </f:RenderField>--%>
<f:TemplateField ColumnID="AcceptanceCheckMan" Width="280px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center"> <f:TemplateField ColumnID="AcceptanceCheckMan" Width="280px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
@ -79,13 +79,13 @@
<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">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionId")+"R") %>' ToolTip="附件查看"></asp:LinkButton> Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionId")+"R") %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
</Columns> </Columns>

24
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;
@ -258,7 +259,7 @@ namespace FineUIPro.Web.common
join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId into zGroup join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId into zGroup
from z in zGroup.DefaultIfEmpty() from z in zGroup.DefaultIfEmpty()
where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
select new {x.IDCardNo, z.PostType }; select new { x.IDCardNo, z.PostType };
AllCount = getallin.Count(); AllCount = getallin.Count();
if (AllCount > 0) if (AllCount > 0)
@ -937,23 +938,20 @@ 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);
} }
@ -974,8 +972,8 @@ namespace FineUIPro.Web.common
} }
} }
} }
if (b > 0) if (b > 0)
{ {
hjallNumber = b.ToString(); hjallNumber = b.ToString();
@ -1654,7 +1652,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
SqlParameter[] Staticparameter = listStaticListStr.ToArray(); SqlParameter[] Staticparameter = listStaticListStr.ToArray();
DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter); DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId && x.State!="1" 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 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"); var closecount = list.Count(x => x.State == "0");
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount); gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);