|
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
index acb65b97..8458d1d5 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
@@ -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();//合格焊工统计
- }
+ }
}
///
@@ -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
+
+
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx
index 0410f713..0e0bc9f3 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx
@@ -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" %>
@@ -100,12 +100,12 @@
|
—
+ onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+ OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged" >
|
diff --git a/SGGL/FineUIPro.Web/File/智慧施工软件使用说明书.rar b/SGGL/FineUIPro.Web/File/智慧施工软件使用说明书.rar
new file mode 100644
index 00000000..bf5464c7
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/智慧施工软件使用说明书.rar differ
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
index 30dde699..4e4516d0 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
@@ -159,6 +159,10 @@