2023-09-21

This commit is contained in:
2023-09-21 17:42:56 +08:00
parent b32589d390
commit 375c6c260f
19 changed files with 418 additions and 163 deletions
@@ -50,8 +50,8 @@
 编辑施工质量月报
</td>
<td align="right" valign="middle" style="width: 50%; height: 30px;">
<asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click"
ValidationGroup="Save" /><asp:ImageButton ID="btnPrint" runat="server" ImageUrl="~/Images/Print.gif" OnClick="btnPrint_Click" />
<asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click"
ValidationGroup="Save" /><asp:ImageButton ID="btnPrint" runat="server" ImageUrl="~/Images/Print.gif" OnClick="btnPrint_Click" />
</td>
</tr>
</table>
@@ -187,7 +187,7 @@
</tr>
<tr>
<td colspan="2">
<asp:GridView ID="gvRowMaterialProblem" runat="server" AllowSorting="True" AutoGenerateColumns="False"
<asp:GridView ID="gvRowMaterialProblem" runat="server" AllowSorting="True" AutoGenerateColumns="False"
HorizontalAlign="Justify" PageSize="12" Width="100%" OnRowCommand="gvRowMaterialProblem_RowCommand"
>
<Columns>
@@ -545,8 +545,8 @@
</tr>
<tr>
<td>
<asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True"
AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated">
<asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True"
AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated" >
<AlternatingRowStyle CssClass="GridBgColr" />
<HeaderStyle CssClass="GridBgColr" />
<PagerStyle HorizontalAlign="Left" />
@@ -7,6 +7,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using SgManager.AI;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.ManageReport
{
@@ -59,6 +60,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{
if (!IsPostBack)
{
this.EnableViewState=true;
this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
this.ReportId = Request.Params["reportId"];
if (!string.IsNullOrEmpty(Request.Params["view"]))
@@ -96,6 +98,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
{
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1));
//this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00");
//this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00");
}
CheckLotBindStatisc("CV");//检验批统计:土建
CheckLotBindStatisc("EQ");//检验批统计:设备
@@ -109,7 +113,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
NCRBindStatisc();//NCR统计
DesignChangeOrderBindStatisc();//设计变更统计
PassWelderBindStatisc();//合格焊工统计
}
}
}
/// <summary>
@@ -636,6 +640,34 @@ namespace FineUIPro.Web.CQMS.ManageReport
}
StatisticsList.Add(StatisticsLast);
}
else //新增本周/月无验收数据的也需要列出表格
{
Model.CheckStatisc StatisticsLast = new Model.CheckStatisc();
StatisticsLast.Num = StatisticsList.Count() + 1;
StatisticsLast.WorkName = "合计";
StatisticsLast.CheckNum =0;
StatisticsLast.TotalCheckNum = 0;
StatisticsLast.OKNum = 0;
StatisticsLast.TotalOKNum = 0;
if (StatisticsLast.CheckNum != 0)//被除数不能为零
{
StatisticsLast.OneOKRate = Math.Round((double)StatisticsLast.OKNum / (double)StatisticsLast.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
StatisticsLast.OneOKRate = "0%";
}
if (StatisticsLast.TotalCheckNum != 0)//被除数不能为零
{
StatisticsLast.TotalOneOKRate = Math.Round((double)StatisticsLast.TotalOKNum / (double)StatisticsLast.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
StatisticsLast.TotalOneOKRate = "0%";
}
StatisticsList.Add(StatisticsLast);
}
if (cNProfessionalCode == "CV")
{
@@ -1274,5 +1306,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
}
}
#endregion
}
}
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReport.WeekReportEdit" %>
<%@Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReport.WeekReportEdit" %>
<!DOCTYPE html>
@@ -100,12 +100,12 @@
</td>
<td align="left" style="width: 90%">
<asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="true"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
<asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="true"
OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged" ></asp:TextBox>
</td>
</tr>
</table>