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

2023-10-8

This commit is contained in:
李鹏飞 2023-10-08 15:32:21 +08:00
parent f4173186a0
commit 2343cca1fa
7 changed files with 149 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_CWCEC/v17/.wsuo
View File

Binary file not shown.

BIN
DataBase/版本日志/SGGLDB_WH_2023-09-27.sql Normal file
View File

Binary file not shown.

41
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx
View File

@ -110,7 +110,7 @@
<tr> <tr>
<td> <td>
<table id="Table3" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table3" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image1" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image1" runat="server" />
1、本月主要工作内容 1、本月主要工作内容
@ -161,7 +161,7 @@
<tr> <tr>
<td> <td>
<table id="Table4" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table4" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image2" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image2" runat="server" />
2、本月质量问题处理情况 2、本月质量问题处理情况
@ -173,7 +173,7 @@
<tr> <tr>
<td> <td>
<table id="Table6" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table6" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image3" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image3" runat="server" />
&nbsp;1）原材料问题 &nbsp;1）原材料问题
@ -257,7 +257,7 @@
<tr> <tr>
<td> <td>
<table id="Table7" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table7" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image4" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image4" runat="server" />
&nbsp;2）施工过程问题 &nbsp;2）施工过程问题
@ -343,7 +343,7 @@
<tr> <tr>
<td> <td>
<table id="Table8" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table8" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image5" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image5" runat="server" />
3、本月质量控制 3、本月质量控制
@ -355,7 +355,7 @@
<tr> <tr>
<td> <td>
<table id="Table9" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table9" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image6" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image6" runat="server" />
&nbsp;1）综合管理 &nbsp;1）综合管理
@ -395,13 +395,13 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image7" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image7" runat="server" />
&nbsp;2）检验批统计 &nbsp;2）检验批统计
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;土建： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;土建：
</td> </td>
</tr> </tr>
@ -416,7 +416,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;设备： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;设备：
</td> </td>
</tr> </tr>
@ -431,7 +431,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;管道： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;管道：
</td> </td>
</tr> </tr>
@ -446,7 +446,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;电气： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;电气：
</td> </td>
</tr> </tr>
@ -461,7 +461,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;仪表： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;仪表：
</td> </td>
</tr> </tr>
@ -476,7 +476,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;防腐： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;防腐：
</td> </td>
</tr> </tr>
@ -491,7 +491,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;消防： <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold; height: 32px;">&nbsp;消防：
</td> </td>
</tr> </tr>
@ -506,7 +506,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image8" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image8" runat="server" />
&nbsp;3）无损检测统计 &nbsp;3）无损检测统计
@ -523,7 +523,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image9" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image9" runat="server" />
&nbsp;4）NCR统计 &nbsp;4）NCR统计
@ -531,6 +531,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True" <asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True"
AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated"> AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated">
<AlternatingRowStyle CssClass="GridBgColr" /> <AlternatingRowStyle CssClass="GridBgColr" />
@ -540,7 +541,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image10" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image10" runat="server" />
&nbsp;5）设计变更统计 &nbsp;5）设计变更统计
@ -557,7 +558,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image11" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image11" runat="server" />
&nbsp;6）合格焊工统计 &nbsp;6）合格焊工统计
@ -574,7 +575,7 @@
</asp:GridView> </asp:GridView>
</td> </td>
</tr> </tr>
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image13" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image13" runat="server" />
&nbsp;7）施工方案统计 &nbsp;7）施工方案统计
@ -594,7 +595,7 @@
<tr> <tr>
<td> <td>
<table id="Table10" runat="server" width="100%" cellpadding="0" cellspacing="0"> <table id="Table10" runat="server" width="100%" cellpadding="0" cellspacing="0">
<tr style="background: url('../Images/bg-1.gif')"> <tr style="background: url('../../Images/bg-1.gif')">
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image12" runat="server" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image12" runat="server" />
4、下月质量控制重点 4、下月质量控制重点

38
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
View File

@ -96,8 +96,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
else else
{ {
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.IsNullOrEmpty(Request.Params["startdate"])? string.Format("{0:yyyy-MM-dd}", DateTime.Now): Request.Params["startdate"];
this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)): Request.Params["enddate"];
//this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); //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"); //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00");
} }
@ -1272,19 +1273,26 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
{ {
CheckLotBindStatisc("CV");//检验批统计:土建 //CheckLotBindStatisc("CV");//检验批统计:土建
CheckLotBindStatisc("EQ");//检验批统计:设备 //CheckLotBindStatisc("EQ");//检验批统计:设备
CheckLotBindStatisc("PP");//检验批统计:管道 //CheckLotBindStatisc("PP");//检验批统计:管道
CheckLotBindStatisc("EL");//检验批统计:电气 //CheckLotBindStatisc("EL");//检验批统计:电气
CheckLotBindStatisc("IN");//检验批统计:仪表 //CheckLotBindStatisc("IN");//检验批统计:仪表
CheckLotBindStatisc("FF");//检验批统计:反腐 //CheckLotBindStatisc("FF");//检验批统计:反腐
CheckLotBindStatisc("XF");//检验批统计:消防 //CheckLotBindStatisc("XF");//检验批统计:消防
GetComprehensive();//综合管理 //GetComprehensive();//综合管理
BindStatisc();//无损检测统计 //BindStatisc();//无损检测统计
NCRBindStatisc();//NCR统计 //NCRBindStatisc();//NCR统计
DesignChangeOrderBindStatisc();//设计变更统计 //DesignChangeOrderBindStatisc();//设计变更统计
PassWelderBindStatisc();//合格焊工统计 //PassWelderBindStatisc();//合格焊工统计
ConstructionStatisticsr();//施工方案统计 //ConstructionStatisticsr();//施工方案统计
//Response.AddHeader("Refresh", "0");
string url = Request.Url.ToString();
if (url.Contains("?"))
{
url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?'));
}
Response.Redirect(url + "?startdate="+txtStartDate.Text+"&enddate="+txtEndDate.Text);
} }
} }
#endregion #endregion

136
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
View File

@ -59,6 +59,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
this.EnableViewState = true;
this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName; this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
this.ReportId = Request.Params["reportId"]; this.ReportId = Request.Params["reportId"];
if (!string.IsNullOrEmpty(Request.Params["view"])) if (!string.IsNullOrEmpty(Request.Params["view"]))
@ -87,15 +88,18 @@ namespace FineUIPro.Web.CQMS.ManageReport
//this.txtPeriod.ReadOnly = true; //this.txtPeriod.ReadOnly = true;
//this.txtStartDate.Enabled = false; //this.txtStartDate.Enabled = false;
//this.txtEndDate.Enabled = false; //this.txtEndDate.Enabled = false;
GetThisWeekOrMonthContentList(this.ReportId);//本周主要工作内容 GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容
GetRowMaterialProblemList(this.ReportId);//原材料问题 GetRowMaterialProblemList(this.ReportId);//原材料问题
GetConstructionProblemsList(this.ReportId);//施工过程问题 GetConstructionProblemsList(this.ReportId);//施工过程问题
GetNextQualityControlList(this.ReportId);//下周质量控制重点 GetNextQualityControlList(this.ReportId);//下月质量控制重点
} }
else else
{ {
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6));
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"];
this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now ): Request.Params["enddate"];
//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("CV");//检验批统计:土建
CheckLotBindStatisc("EQ");//检验批统计:设备 CheckLotBindStatisc("EQ");//检验批统计:设备
@ -110,7 +114,6 @@ namespace FineUIPro.Web.CQMS.ManageReport
DesignChangeOrderBindStatisc();//设计变更统计 DesignChangeOrderBindStatisc();//设计变更统计
PassWelderBindStatisc();//合格焊工统计 PassWelderBindStatisc();//合格焊工统计
ConstructionStatisticsr();//施工方案统计 ConstructionStatisticsr();//施工方案统计
} }
} }
@ -119,23 +122,29 @@ namespace FineUIPro.Web.CQMS.ManageReport
/// </summary> /// </summary>
private void GetComprehensive() private void GetComprehensive()
{ {
int count = 0; decimal? count = 0;
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList(); var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList();
foreach (var item in inspectionEquipments) foreach (var item in inspectionEquipments)
{ {
count += Funs.GetNewIntOrZero(item.Counts); count += Funs.GetNewIntOrZero(item.Counts);
} }
//this.txt1.Text = Convert.ToString(count);
this.txt3.Text = Convert.ToString(count); this.txt3.Text = Convert.ToString(count);
int thisWeekCount = 0; decimal? thisWeekCount = 0;
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList(); var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
foreach (var item in equpments) foreach (var item in equpments)
{ {
thisWeekCount += Funs.GetNewIntOrZero(item.Counts); thisWeekCount += Funs.GetNewIntOrZero(item.Counts);
} }
this.txt2.Text = Convert.ToString(thisWeekCount); this.txt2.Text = Convert.ToString(thisWeekCount);
//if (Convert.ToDecimal(this.txt3.Text.Trim()) > 0)
//{
// this.txt4.Text = Math.Round((double)(Convert.ToDecimal(this.txt2.Text.Trim()) / Convert.ToDecimal(this.txt3.Text.Trim())) * 100, 2) + "%";
//}
//else
//{
// this.txt4.Text = "0";
//}
var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料" && x.EquipmentOrMatail == "材料"
@ -209,7 +218,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
/// <summary> /// <summary>
/// 本周主要工作内容 /// 本月主要工作内容
/// </summary> /// </summary>
private void GetThisWeekOrMonthContentList(string reportId) private void GetThisWeekOrMonthContentList(string reportId)
{ {
@ -244,7 +253,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
/// <summary> /// <summary>
/// 下周质量控制重点 /// 下月质量控制重点
/// </summary> /// </summary>
/// <param name="p"></param> /// <param name="p"></param>
private void GetNextQualityControlList(string reportId) private void GetNextQualityControlList(string reportId)
@ -256,9 +265,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
#endregion #endregion
#region 本周主要内容 #region 本月主要内容
/// <summary> /// <summary>
/// 增加本周主要内容 /// 增加本月主要内容
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -275,7 +284,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
/// <summary> /// <summary>
/// 检查并保存本周主要内容集合 /// 检查并保存本月主要内容集合
/// </summary> /// </summary>
private void saveThisWeekAndMonthContent() private void saveThisWeekAndMonthContent()
{ {
@ -292,7 +301,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
/// <summary> /// <summary>
/// 本周主要内容行点击事件 /// 本月主要内容行点击事件
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -385,6 +394,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.gvRowMaterialProblem.DataBind(); this.gvRowMaterialProblem.DataBind();
} }
} }
#endregion #endregion
#region 施工过程问题 #region 施工过程问题
@ -480,10 +490,11 @@ namespace FineUIPro.Web.CQMS.ManageReport
#endregion #endregion
#region 检验批统计 #region 检验批统计
#region 绑定GridView
/// <summary> /// <summary>
/// 绑定数据 /// 绑定
/// </summary> /// </summary>
/// <param name="cNProfessionalCode"></param> /// <param name="cNProfessionalId"></param>
public void CheckLotBindStatisc(string cNProfessionalCode) public void CheckLotBindStatisc(string cNProfessionalCode)
{ {
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
@ -514,7 +525,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId); Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId);
if (divisionProject != null) if (divisionProject != null)
{ {
Model.WBS_UnitWork ins = BLL.UnitWorkService.getUnitWorkByUnitWorkId(divisionProject.UnitWorkId); Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(divisionProject.UnitWorkId);
if (ins != null) if (ins != null)
{ {
if (!workNames.Contains(ins.UnitWorkName)) //新增记录 if (!workNames.Contains(ins.UnitWorkName)) //新增记录
@ -542,9 +553,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
} }
} }
/*if (cNProfessionalId == BLL.Const.CNProfessionalCVId) //土建按单位工程统计 /*if (cNProfessionalId == BLL.Const.CNProfessionalCVId) //土建按单位工程统计
{ {
} }
else else
{ {
@ -631,6 +642,34 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
StatisticsList.Add(StatisticsLast); 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") if (cNProfessionalCode == "CV")
{ {
@ -668,6 +707,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.gvXF.DataBind(); this.gvXF.DataBind();
} }
} }
#endregion
/// <summary> /// <summary>
/// GridView创建行时激发 /// GridView创建行时激发
@ -808,7 +848,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (e.Row.RowType == DataControlRowType.Header) if (e.Row.RowType == DataControlRowType.Header)
{ {
string headerStr = "序号#分包商#探伤部位#RT数量 本周,累计#一次合格 本周,累计#一次合格率 本周,累计"; string headerStr = "序号#分包商#探伤部位#RT数量 本月,累计#一次合格 本月,累计#一次合格率 本月,累计";
DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
dHelper.SplitTableHeader(e.Row, headerStr); dHelper.SplitTableHeader(e.Row, headerStr);
} }
@ -833,7 +873,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
projectStartDate = project.StartDate.Value; projectStartDate = project.StartDate.Value;
} }
//当期集合 //所有集合
List<Model.Comprehensive_NCRManagement> totalManagementList = BLL.NCRManagementService.GetNCRManagementListByDate(this.CurrUser.LoginProjectId, startDate, endDate); List<Model.Comprehensive_NCRManagement> totalManagementList = BLL.NCRManagementService.GetNCRManagementListByDate(this.CurrUser.LoginProjectId, startDate, endDate);
List<string> unitNames = (from x in totalManagementList select x.ReceiveUnit).Distinct().ToList(); List<string> unitNames = (from x in totalManagementList select x.ReceiveUnit).Distinct().ToList();
foreach (var item in unitNames) foreach (var item in unitNames)
@ -894,7 +934,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (e.Row.RowType == DataControlRowType.Header) if (e.Row.RowType == DataControlRowType.Header)
{ {
string headerStr = "序号#接收单位#本周已完成#累计已完成#NCR总数#累计完成比例"; string headerStr = "序号#接收单位#本月已完成#累计已完成#NCR总数#累计完成比例";
DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
dHelper.SplitTableHeader(e.Row, headerStr); dHelper.SplitTableHeader(e.Row, headerStr);
} }
@ -975,7 +1015,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (e.Row.RowType == DataControlRowType.Header) if (e.Row.RowType == DataControlRowType.Header)
{ {
string headerStr = "序号#专业#发布数量 本周,累计#业主批准数量 本周,累计#完成情况 本周,累计"; string headerStr = "序号#专业#发布数量 本月,累计#业主批准数量 本月,累计#完成情况 本月,累计";
DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
dHelper.SplitTableHeader(e.Row, headerStr); dHelper.SplitTableHeader(e.Row, headerStr);
} }
@ -1008,7 +1048,6 @@ namespace FineUIPro.Web.CQMS.ManageReport
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
var db = Funs.DB; var db = Funs.DB;
foreach (var item in units) foreach (var item in units)
{ {
@ -1091,7 +1130,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (e.Row.RowType == DataControlRowType.Header) if (e.Row.RowType == DataControlRowType.Header)
{ {
string headerStr = "序号#分包商#管道焊工 本周上岗,累计#钢结构焊工 本周上岗,累计#设备焊工 本周上岗,累计#其他 本周上岗,累计"; string headerStr = "序号#分包商#管道焊工 本月上岗,累计#钢结构焊工 本月上岗,累计#设备焊工 本月上岗,累计#其他 本月上岗,累计";
DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
dHelper.SplitTableHeader(e.Row, headerStr); dHelper.SplitTableHeader(e.Row, headerStr);
} }
@ -1162,9 +1201,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
#endregion #endregion
#region 下周质量控制重点 #region 下月质量控制重点
/// <summary> /// <summary>
/// 增加下周质量控制重点 /// 增加下月质量控制重点
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -1233,20 +1272,26 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
{ {
CheckLotBindStatisc("CV");//检验批统计:土建 //CheckLotBindStatisc("CV");//检验批统计:土建
CheckLotBindStatisc("EQ");//检验批统计:设备 //CheckLotBindStatisc("EQ");//检验批统计:设备
CheckLotBindStatisc("PP");//检验批统计:管道 //CheckLotBindStatisc("PP");//检验批统计:管道
CheckLotBindStatisc("EL");//检验批统计:电气 //CheckLotBindStatisc("EL");//检验批统计:电气
CheckLotBindStatisc("IN");//检验批统计:仪表 //CheckLotBindStatisc("IN");//检验批统计:仪表
CheckLotBindStatisc("FF");//检验批统计:反腐 //CheckLotBindStatisc("FF");//检验批统计:反腐
CheckLotBindStatisc("XF");//检验批统计:消防 //CheckLotBindStatisc("XF");//检验批统计:消防
GetComprehensive();//综合管理 //GetComprehensive();//综合管理
BindStatisc();//无损检测统计 //BindStatisc();//无损检测统计
NCRBindStatisc();//NCR统计 //NCRBindStatisc();//NCR统计
DesignChangeOrderBindStatisc();//设计变更统计 //DesignChangeOrderBindStatisc();//设计变更统计
PassWelderBindStatisc();//合格焊工统计 //PassWelderBindStatisc();//合格焊工统计
ConstructionStatisticsr();//施工方案统计 //ConstructionStatisticsr();//施工方案统计
//Response.AddHeader("Refresh", "0");
string url = Request.Url.ToString();
if (url.Contains("?"))
{
url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?'));
}
Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text);
} }
} }
#endregion #endregion
@ -1272,7 +1317,6 @@ namespace FineUIPro.Web.CQMS.ManageReport
ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true); ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true);
return; return;
} }
} }
if (!string.IsNullOrEmpty(this.txtStartDate.Text)) if (!string.IsNullOrEmpty(this.txtStartDate.Text))
{ {
@ -1282,7 +1326,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{ {
report.EndDate = Convert.ToDateTime(this.txtEndDate.Text); report.EndDate = Convert.ToDateTime(this.txtEndDate.Text);
} }
report.ReportType = "1"; report.ReportType = "2";
BLL.ThisWeekOrMonthContentService.DeleteThisWeekOrMonthContentByReportId(this.ReportId); BLL.ThisWeekOrMonthContentService.DeleteThisWeekOrMonthContentByReportId(this.ReportId);
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(this.ReportId); BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(this.ReportId);
@ -1300,7 +1344,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
report.ReportId = this.ReportId; report.ReportId = this.ReportId;
BLL.WeekAndMonthReportService.AddWeekAndMonthReport(report); BLL.WeekAndMonthReportService.AddWeekAndMonthReport(report);
} }
//本周主要工作内容 //本月主要工作内容
saveThisWeekAndMonthContent(); saveThisWeekAndMonthContent();
foreach (var item in thisWeekOrMonthContentLists) foreach (var item in thisWeekOrMonthContentLists)
{ {
@ -1336,7 +1380,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
comprehensive.Others = this.txt9.Text.Trim(); comprehensive.Others = this.txt9.Text.Trim();
BLL.ComprehensiveService.AddComprehensive(comprehensive); BLL.ComprehensiveService.AddComprehensive(comprehensive);
//下周质量控制重点 //下月质量控制重点
saveNextQualityControl(); saveNextQualityControl();
foreach (var item in nextQualityControlLists) foreach (var item in nextQualityControlLists)
{ {
@ -1369,5 +1413,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
} }
#endregion #endregion
} }
} }

20
SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" ValidateRequest="false" %>
<!DOCTYPE html> <!DOCTYPE html>
@ -155,7 +155,7 @@
<Items> <Items>
<f:ContentPanel ID="ContentPanel1" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true" <f:ContentPanel ID="ContentPanel1" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"
BodyPadding="0px"> BodyPadding="0px">
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true" <f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true" IsFluid="True"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
@ -179,16 +179,22 @@
</f:FormRow> </f:FormRow>
<f:FormRow runat="server"> <f:FormRow runat="server">
<Items> <Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员" Readonly="True" Enabled="False"/>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Tree ID="trCopyMan" EnableCollapse="true" ShowHeader="false" Title="抄送人员" EnableCheckBox="true" <f:ContentPanel runat="server" BodyPadding="5px" ShowHeader="False" ShowBorder="False">
AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true" IsFluid="True" <Items>
EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck"> <f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员" Readonly="True" Enabled="False"/>
</f:Tree>
<f:Tree ID="trCopyMan" EnableCollapse="true" ShowHeader="false" Title="抄送人员" EnableCheckBox="true"
AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true" IsFluid="True"
EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck">
</f:Tree>
</Items>
</f:ContentPanel>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>

2
SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs
View File

@ -524,7 +524,7 @@ namespace FineUIPro.Web.DocManage
approve1.ApproveMan = CurrUser.UserId; approve1.ApproveMan = CurrUser.UserId;
DocManageApproveService.AddDocManageApprove(approve1); DocManageApproveService.AddDocManageApprove(approve1);
} }
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
LogService.AddSys_Log(CurrUser, doc.DocCode, DocId, Const.DocManageMenuId, "编辑文档"); LogService.AddSys_Log(CurrUser, doc.DocCode, DocId, Const.DocManageMenuId, "编辑文档");
} }