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

1

Browse Source
This commit is contained in:
夏菊
2025-10-24 18:27:46 +08:00
parent 47172cd0b3
commit 78a2b0f525
47 changed files with 678 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs
+1 -1
View File
@@ -3179,7 +3179,7 @@ namespace FineUIPro.Web.CQMS.DataBase
Ins.UnitWorkId,
Ins.ControlPointType,
Ins.AcceptanceSite,
(CASE WHEN Ins.IsOnceQualified=0 THEN '否' ELSE '是' END) AS IsOnceQualified,
(CASE WHEN Ins.IsOnceQualified=1 THEN '是' ELSE '否' END) AS IsOnceQualified,
Ins.InspectionDate,
Ins.AttachUrl,
Ins.CheckDate,
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace FineUIPro.Web.CQMS.Foreign
checks.Branch,
breakdown.BreakdownName as ControlPointType,
checks.AcceptanceSite,
(CASE WHEN checks.IsOnceQualified='Flase' THEN '否' ELSE '是' END) AS IsOnceQualified,
(CASE WHEN checks.IsOnceQualified='True' THEN '是' ELSE '否' END) AS IsOnceQualified,
checks.InspectionDate,
checks.AttachUrl,
checks.CheckDate,
SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs
+8 -8
View File
@@ -101,8 +101,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
else //更新已有记录
@@ -110,8 +110,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.CheckNum = managementList.Count();
checkStatisc.TotalCheckNum = totalManagementList.Count();
checkStatisc.OKNum = managementList.Count(x => x.IsOnceQualified == null|| x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -251,7 +251,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
else //更新已有记录
@@ -259,8 +259,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
+2 -2
View File
@@ -535,8 +535,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx.cs
+16 -16
View File
@@ -250,8 +250,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -260,8 +260,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -286,8 +286,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -296,8 +296,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -1519,8 +1519,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -1529,8 +1529,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -1555,8 +1555,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -1565,8 +1565,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
+2 -2
View File
@@ -530,8 +530,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx.cs
+16 -16
View File
@@ -252,8 +252,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -262,8 +262,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -288,8 +288,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -298,8 +298,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -1523,8 +1523,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -1533,8 +1533,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
@@ -1559,8 +1559,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
i++;
}
@@ -1569,8 +1569,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
}
}
}
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+72 -18
View File
@@ -1454,7 +1454,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
string UnitWorkName = checkLotBindStatiscData.Rows[i]["UnitWorkName"].ToString();
string cNProfessionalCode = checkLotBindStatiscData.Rows[i]["cNProfessionalCode"].ToString();
string IsOnceQualified = checkLotBindStatiscData.Rows[i]["IsOnceQualified"].ToString();
DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
DateTime? CompileDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["CompileDate"].ToString());
//DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
if (tempCV != cNProfessionalCode || tempArea != UnitWorkName)
{
@@ -1477,7 +1478,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
{
checkStatisc.CheckNum += 1;
if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
@@ -1485,6 +1486,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.OKNum += 1;
}
}
//if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
//{
// checkStatisc.CheckNum += 1;
// if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
// {
// checkStatisc.OKNum += 1;
// }
//}
checkStatisc.TotalCheckNum += 1;
//if (IsOnceQualified == "1")
@@ -1925,7 +1934,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
string UnitId = row["UnitId"].ToString();
string IsOnceQualified = row["IsOnceQualified"].ToString();
DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
//DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
DateTime? CompileDate = Funs.GetNewDateTime(row["CompileDate"].ToString());
if (!Quantity1Dic.ContainsKey(UnitId))
{
Quantity1Dic.Add(UnitId, 0);
@@ -1942,7 +1952,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
Quantity4Dic.Add(UnitId, 0);
}
if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
{
Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
if (IsOnceQualified == "1")
@@ -1950,6 +1960,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
}
}
//if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
//{
// Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
// if (IsOnceQualified == "1")
// {
// Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
// }
//}
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + 1;
if (IsOnceQualified == "1")
{
@@ -2499,22 +2517,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
string CheckType = row["CheckType"].ToString();
DateTime? CheckDate = Funs.GetNewDateTime(row["CheckDate"].ToString());
if (!Quantity1Dic.ContainsKey(CheckType))
string CheckTypeName = ConvertJointCheckType(CheckType);
if (!Quantity1Dic.ContainsKey(CheckTypeName))
{
Quantity1Dic.Add(CheckType, 0);
Quantity1Dic.Add(CheckTypeName, 0);
}
if (!Quantity2Dic.ContainsKey(CheckType))
if (!Quantity2Dic.ContainsKey(CheckTypeName))
{
Quantity2Dic.Add(CheckType, 0);
Quantity2Dic.Add(CheckTypeName, 0);
}
if (CheckDate.HasValue && CheckDate.Value >= startDate && CheckDate.Value <= endDate)
{
Quantity1Dic[CheckType] = Quantity1Dic[CheckType] + 1;
Quantity1Dic[CheckTypeName] = Quantity1Dic[CheckTypeName] + 1;
}
Quantity2Dic[CheckType] = Quantity2Dic[CheckType] + 1;
Quantity2Dic[CheckTypeName] = Quantity2Dic[CheckTypeName] + 1;
}
@@ -4138,6 +4156,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new
{
c.InspectionDate,
c.CompileDate,
c.ProjectId,
u.UnitId,
u.UnitName,
@@ -4150,14 +4169,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new
{
x.InspectionDate,
x.CompileDate,
x.ProjectId,
x.UnitId,
x.UnitName,
x.IsOnceQualified
};
var AllList = query.ToList();
//var monethCount = query
// .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
var monethCount = query
.Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
.Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@@ -4166,8 +4188,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = item.UnitName;
checkStatisc.CheckNum = monethCount.Count();
checkStatisc.TotalCheckNum = AllList.Count();
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -4244,7 +4266,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
return await Task.Run(() =>
{
string strSql = @"select UnitId,IsOnceQualified, InspectionDate from View_CQMS_InspectionManagementDetail
string strSql = @"select UnitId,IsOnceQualified, InspectionDate, CompileDate from View_MonthReport_InspectionManagement
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
return dt;
@@ -4298,8 +4320,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -4491,7 +4513,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
return await Task.Run(() =>
{
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate from View_MonthReport_InspectionManagement a
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate from View_MonthReport_InspectionManagement a
left join WBS_UnitWork b on a.UnitWorkId =b.UnitWorkId
left join Base_CNProfessional c on a.CNProfessionalId= c.CNProfessionalId
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' order by cNProfessionalCode,UnitWorkName";
@@ -7163,5 +7185,37 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
//<summary>
//获取检查类别
//</summary>
//<param name="state"></param>
//<returns></returns>
protected string ConvertJointCheckType(string CheckType)
{
if (!string.IsNullOrWhiteSpace(CheckType))
{
string checkType = CheckType.ToString();
if (checkType == "1")
{
return "周检查";
}
else if (checkType == "2")
{
return "月检查";
}
else if (checkType == "3")
{
return "不定期检查";
}
else if (checkType == "4")
{
return "专业检查";
}
}
return CheckType;
}
}
}
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+2 -2
View File
@@ -664,8 +664,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
}
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
+2 -2
View File
@@ -1576,8 +1576,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc);
}
}
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+68 -11
View File
@@ -1426,7 +1426,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
string UnitWorkName = checkLotBindStatiscData.Rows[i]["UnitWorkName"].ToString();
string cNProfessionalCode = checkLotBindStatiscData.Rows[i]["cNProfessionalCode"].ToString();
string IsOnceQualified = checkLotBindStatiscData.Rows[i]["IsOnceQualified"].ToString();
DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
//DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
DateTime? CompileDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["CompileDate"].ToString());
if (tempCV != cNProfessionalCode || tempArea != UnitWorkName)
{
@@ -1449,7 +1450,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
{
checkStatisc.CheckNum += 1;
if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
@@ -1457,6 +1458,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.OKNum += 1;
}
}
//if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
//{
// checkStatisc.CheckNum += 1;
// if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
// {
// checkStatisc.OKNum += 1;
// }
//}
checkStatisc.TotalCheckNum += 1;
if (IsOnceQualified == "1")
@@ -1897,7 +1906,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
string UnitId = row["UnitId"].ToString();
string IsOnceQualified = row["IsOnceQualified"].ToString();
DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
//DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
DateTime? CompileDate = Funs.GetNewDateTime(row["CompileDate"].ToString());
if (!Quantity1Dic.ContainsKey(UnitId))
{
Quantity1Dic.Add(UnitId, 0);
@@ -1914,7 +1924,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
Quantity4Dic.Add(UnitId, 0);
}
if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
{
Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
if (IsOnceQualified == "1")
@@ -1922,6 +1932,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
}
}
//if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
//{
// Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
// if (IsOnceQualified == "1")
// {
// Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
// }
//}
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + 1;
if (IsOnceQualified == "1")
{
@@ -2471,6 +2489,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
string CheckType = row["CheckType"].ToString();
DateTime? CheckDate = Funs.GetNewDateTime(row["CheckDate"].ToString());
string CheckTypeName = ConvertJointCheckType(CheckType);
if (!Quantity1Dic.ContainsKey(CheckType))
{
@@ -4107,6 +4126,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new
{
c.CheckDate,
c.InspectionDate,
c.CompileDate,
c.ProjectId,
u.UnitId,
u.UnitName,
@@ -4119,14 +4140,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new
{
x.CheckDate,
x.InspectionDate,
x.CompileDate,
x.ProjectId,
x.UnitId,
x.UnitName,
x.IsOnceQualified
};
var AllList = query.ToList();
//var monethCount = query
// .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
var monethCount = query
.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
.Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@@ -4135,8 +4161,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = item.UnitName;
checkStatisc.CheckNum = monethCount.Count();
checkStatisc.TotalCheckNum = AllList.Count();
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -4209,7 +4235,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
return await Task.Run(() =>
{
string strSql = @"select UnitId,IsOnceQualified, InspectionDate from View_CQMS_InspectionManagementDetail
string strSql = @"select UnitId,IsOnceQualified, InspectionDate,CompileDate from View_MonthReport_InspectionManagement
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
return dt;
@@ -4262,8 +4288,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -4453,7 +4479,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
return await Task.Run(() =>
{
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate from View_MonthReport_InspectionManagement a
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate from View_MonthReport_InspectionManagement a
left join WBS_UnitWork b on a.UnitWorkId =b.UnitWorkId
left join Base_CNProfessional c on a.CNProfessionalId= c.CNProfessionalId
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' order by cNProfessionalCode,UnitWorkName";
@@ -7103,5 +7129,36 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
//<summary>
//获取检查类别
//</summary>
//<param name="state"></param>
//<returns></returns>
protected string ConvertJointCheckType(string CheckType)
{
if (!string.IsNullOrWhiteSpace(CheckType))
{
string checkType = CheckType.ToString();
if (checkType == "1")
{
return "周检查";
}
else if (checkType == "2")
{
return "月检查";
}
else if (checkType == "3")
{
return "不定期检查";
}
else if (checkType == "4")
{
return "专业检查";
}
}
return CheckType;
}
}
}
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx
+14 -3
View File
@@ -22,18 +22,26 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
<f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px" Width="180px">
</f:DropDownList>
<f:DatePicker runat="server" Label="验收日期" ID="txtStarTime" LabelAlign="Right"
LabelWidth="100px" Width="220px">
LabelWidth="90px" Width="200px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
Width="110px">
</f:DatePicker>
<f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
LabelWidth="90px" Width="200px">
</f:DatePicker>
<f:Label ID="Label2" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
Width="110px">
</f:DatePicker>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
</f:Button>
@@ -82,6 +90,9 @@
<f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" SortField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="创建日期" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+12 -2
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
public void BindGrid()
{
StringBuilder sb = new StringBuilder();
sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate ");
sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate,P.CompileDate ");
sb.Append("FROM ProcessControl_InspectionManagement AS P ");
sb.Append("LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId ");
sb.Append("LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId ");
@@ -68,6 +68,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
listStr.Add(new SqlParameter("@endTime", endTime));
}
}
if (!string.IsNullOrEmpty(txtCompileDateS.Text.Trim()))
{
sb.Append("AND P.CompileDate >= @CompileDateS ");
listStr.Add(new SqlParameter("@CompileDateS", Funs.GetNewDateTime(txtCompileDateS.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtCompileDateE.Text.Trim()))
{
sb.Append("AND P.CompileDate <= @CompileDateE ");
listStr.Add(new SqlParameter("@CompileDateE", Funs.GetNewDateTime(txtCompileDateE.Text.Trim())));
}
sb.Append("ORDER BY P.NoticeCode DESC ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
@@ -349,7 +359,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IsOnceQualified == false ? "否" : "是");//是否一次合格
cell.SetCellValue(item.IsOnceQualified == true ? "是" : "否");//是否一次合格
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs
Generated
+54 -25
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ProcessControl {
public partial class InspectionManagement {
namespace FineUIPro.Web.CQMS.ProcessControl
{
public partial class InspectionManagement
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCNProfessional 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessional;
/// <summary>
/// txtStarTime 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@@ -101,7 +103,34 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// txtCompileDateS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateS;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// txtCompileDateE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateE;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx
+2 -2
View File
@@ -38,8 +38,8 @@
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblIsOnceQualified" runat="server" Label="是否一次合格" LabelAlign="Right" LabelWidth="130px" AutoPostBack="true" OnSelectedIndexChanged="rblIsOnceQualified_SelectedIndexChanged">
<f:RadioItem Value="True" Text="是" Selected="true" />
<f:RadioItem Value="False" Text="否" />
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Text="否" Selected="true" />
</f:RadioButtonList>
<f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:DatePicker>
</Items>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs
+2 -2
View File
@@ -120,9 +120,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
else
{
//统计所给事件段的全部数量
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false);
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NextDate, false);
//统计所给事件段的合格数量
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true);
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NextDate, true);
}
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate);
Statistics.SunNumber = managementListSunNumber.Count();
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx
+10 -2
View File
@@ -24,16 +24,24 @@
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="110px">
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px" Width="180px">
</f:DropDownList>
<f:DatePicker runat="server" Label="验收日期" ID="txtStarTime" LabelAlign="Right"
LabelWidth="100px" Width="220px">
LabelWidth="90px" Width="200px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
Width="110px">
</f:DatePicker>
<f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
LabelWidth="90px" Width="200px">
</f:DatePicker>
<f:Label ID="Label2" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
Width="110px">
</f:DatePicker>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
</f:Button>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+10
View File
@@ -188,6 +188,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
sb.Append("AND P.InspectionDate <= @endTime ");
listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtCompileDateS.Text.Trim()))
{
sb.Append("AND P.CompileDate >= @CompileDateS ");
listStr.Add(new SqlParameter("@CompileDateS", Funs.GetNewDateTime(txtCompileDateS.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtCompileDateE.Text.Trim()))
{
sb.Append("AND P.CompileDate <= @CompileDateE ");
listStr.Add(new SqlParameter("@CompileDateE", Funs.GetNewDateTime(txtCompileDateE.Text.Trim())));
}
sb.Append("ORDER BY P.NoticeCode DESC ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs
Generated
+57 -28
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ProcessControl {
public partial class InspectionNotice {
namespace FineUIPro.Web.CQMS.ProcessControl
{
public partial class InspectionNotice
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCNProfessional 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessional;
/// <summary>
/// txtStarTime 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@@ -101,7 +103,34 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// txtCompileDateS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateS;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// txtCompileDateE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateE;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDel;
/// <summary>
/// btnPrinter 控件。
/// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnPrinter;
/// <summary>
/// btnMenuCopy 控件。
/// </summary>