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

1

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DataBase/版本日志/SUBQHSE_V2025-10-24-xiaj.sql Normal file
View File

@ -0,0 +1,28 @@
ALTER VIEW [dbo].[View_MonthReport_InspectionManagement]
AS
/************Ô±¨È¡Êý************/
select im.InspectionId,
im.ProjectId,
im.CNProfessionalId,
im.IsOnceQualified,
im.InspectionDate,
im.CompileDate,
im.UnitId,
detail.UnitWorkId
from ProcessControl_InspectionManagement as im
left join (select distinct(InspectionId),UnitWorkId from ProcessControl_InspectionManagementDetail) as detail on detail.InspectionId = im.InspectionId
GO
update ProcessControl_InspectionManagement
set IsOnceQualified=1,InspectionDate=DATEADD(day,1,CompileDate)
where InspectionDate is null and IsOnceQualified is null and CompileDate<'2025-10-01'
GO
update ProcessControl_InspectionManagement
set InspectionDate=DATEADD(day,1,CompileDate)
where InspectionDate is null and IsOnceQualified is not null and CompileDate<'2025-10-01'
GO

2
SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs
View File

@ -32,7 +32,7 @@ namespace BLL.API.CQMS
newInspectionManagement.Branch = inspectionManagement.Branch;
newInspectionManagement.ControlPointType = inspectionManagement.ControlPointType;
newInspectionManagement.AcceptanceSite = inspectionManagement.AcceptanceSite;
newInspectionManagement.IsOnceQualified = (inspectionManagement.IsOnceQualified == "true"|| inspectionManagement.IsOnceQualified == null) ? true : false;
newInspectionManagement.IsOnceQualified = (inspectionManagement.IsOnceQualified == "true"|| inspectionManagement.IsOnceQualified == "True") ? true : false;
if (!string.IsNullOrEmpty(inspectionManagement.InspectionDate))
newInspectionManagement.InspectionDate = DateTime.Parse(inspectionManagement.InspectionDate);
newInspectionManagement.AttachUrl = inspectionManagement.AttachUrl;

4
SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs
View File

@ -164,7 +164,7 @@ namespace BLL
{
return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
where x.InspectionId == InspectionId && y.IsOnceQualified == true
select x).ToList();
}
}
@ -174,7 +174,7 @@ namespace BLL
{
return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
where x.InspectionId == InspectionId && y.IsOnceQualified == true
select x).ToList();
}
}

116
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
View File

@ -72,7 +72,7 @@ namespace BLL
ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
x.AcceptanceSite,
IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
x.InspectionDate,
x.AttachUrl,
x.AttachUrl2,
@ -121,7 +121,7 @@ namespace BLL
ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
x.AcceptanceSite,
IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
x.InspectionDate,
x.AttachUrl,
x.AttachUrl2,
@ -322,16 +322,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -349,16 +357,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -371,16 +387,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -419,16 +443,24 @@ namespace BLL
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -446,16 +478,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -469,16 +509,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@ -498,16 +546,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}

14
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -1527,7 +1527,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1589,7 +1589,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1650,7 +1650,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1713,7 +1713,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1776,7 +1776,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1839,7 +1839,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,
@ -1901,7 +1901,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput()
{
ProjectId = y.ProjectId,

12
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -743,7 +743,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
@ -768,7 +768,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
@ -793,7 +793,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
@ -818,7 +818,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
@ -843,7 +843,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
@ -868,7 +868,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
where y.ProjectId == projectid && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}

2
SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs
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,

2
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs
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,

16
SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs
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);
}
}
}

4
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
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);
}

32
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx.cs
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);
}
}
}

4
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
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);
}

32
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx.cs
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);
}
}
}

90
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
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;
}
}
}

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
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);
}
}

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
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);
}
}

79
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
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;
}
}
}

17
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx
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"

14
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
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;

79
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx
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>

4
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs
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();

12
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx
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>

10
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
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);

85
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs generated
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>

8
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx
View File

@ -33,6 +33,14 @@
</f:Label>
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>
<f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
LabelWidth="90px" Width="200px">
</f:DatePicker>
<f:Label ID="Label4" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
Width="110px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">

42
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
View File

@ -166,6 +166,8 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
@ -173,7 +175,15 @@ namespace FineUIPro.Web.DataShow
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.InspectionDate <= datetime2);
}
if (datetime3.HasValue)
{
getT = getT.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getT = getT.Where(x => x.CompileDate <= datetime4);
}
cout1 = getT.Count();
@ -188,14 +198,24 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
if (datetime1.HasValue)
{
getT = getT.Where(x => x.InspectionDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.InspectionDate <= datetime2);
}
if (datetime3.HasValue)
{
getT = getT.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getT = getT.Where(x => x.CompileDate <= datetime4);
}
cout1 = getT.Count();
@ -210,17 +230,27 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getALL = getALL.Where(x => x.InspectionDate >= datetime1);
}
if (datetime2.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getALL = getALL.Where(x => x.InspectionDate >= datetime1);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true));
if (datetime3.HasValue)
{
getALL = getALL.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getALL = getALL.Where(x => x.CompileDate <= datetime4);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
int coutall = getALL.Count();
int cout0 = getT.Count();
if (coutall > 0)

77
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow {
public partial class InspectionManagement {
namespace FineUIPro.Web.DataShow
{
public partial class InspectionManagement
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// txtStartTime 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// Label3 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@ -92,7 +94,34 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// txtCompileDateS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateS;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// txtCompileDateE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDateE;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -101,7 +130,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// labNumber 控件。
/// </summary>
@ -110,7 +139,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// Label2 控件。
/// </summary>
@ -119,7 +148,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label5 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -182,7 +211,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnView 控件。
/// </summary>

2
SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs
View File

@ -53,7 +53,7 @@ namespace FineUIPro.Web.DataShow
BP.Class,
P.AcceptanceSite,
P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='Flase' THEN '否' ELSE '是' END)AS IsOnceQualified,
(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
P.InspectionCode,
P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagementDetail AS D"

6
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
View File

@ -162,7 +162,7 @@ namespace FineUIPro.Web.DataShow
int cout1 = 0;
if (projectId != null)
{
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
cout1 = getT.Count();
}
return cout1;
@ -179,7 +179,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
cout1 = getT1.Count() - getT2.Count();
}
return cout1;
@ -196,7 +196,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
if (getT1.Count() > 0)
{
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();

2
SGGL/FineUIPro.Web/DataShowLocal/InspectionManagementStatisc.aspx.cs
View File

@ -185,7 +185,7 @@ namespace FineUIPro.Web.DataShowLocal
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.View_CQMS_InspectionManagementDetail
where x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.ProjectId == projectId.ToString() && x.IsOnceQualified == true
select x;
if (datetime1.HasValue)

18
SGGL/FineUIPro.Web/TestRun/FeedingTestRun.aspx
View File

@ -11,12 +11,18 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
<%-- <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="FeedingTestRunId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="FeedingTestRunId" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick" Height="660px">
<Toolbars>--%>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="FeedingTestRunId" DataIDField="FeedingTestRunId" AllowSorting="true"
SortField="Code" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" Height="660px">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -53,12 +59,12 @@
FieldType="String" HeaderText="试车情况说明" HeaderTextAlign="Center" Width="220px">
</f:RenderField>
<f:RenderField ColumnID="ProblemsAndSolutions" DataField="ProblemsAndSolutions"
FieldType="String" HeaderText="出现问题及解决措施" HeaderTextAlign="Center" Width="220px">
FieldType="String" HeaderText="出现问题及解决措施" HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px">
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="70px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
</Columns>
<Listeners>

2
SGGL/FineUIPro.Web/TestRun/FeedingTestRun.aspx.cs
View File

@ -174,7 +174,7 @@ namespace FineUIPro.Web.TestRun
string id = Grid1.DataKeys[e.RowIndex][0].ToString();
if (e.CommandName == "AttachUrl")
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", id, BLL.Const.FeedingTestRunMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", id, BLL.Const.FeedingTestRunMenuId)));
}
}
#endregion

2
SGGL/FineUIPro.Web/TestRun/FeedingTestRunEdit.aspx.cs
View File

@ -54,7 +54,7 @@ namespace FineUIPro.Web.TestRun
{
this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_FeedingTestRun));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", this.hdId.Text, BLL.Const.FeedingTestRunMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", this.hdId.Text, BLL.Const.FeedingTestRunMenuId)));
}
#endregion

4
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSCheckData.aspx.cs
View File

@ -70,8 +70,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value1 = managementList.Count();
value2 = totalManagementList.Count();
value3 = managementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value4 = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value3 = managementList.Count(x => x.IsOnceQualified == true);
value4 = totalManagementList.Count(x => x.IsOnceQualified == true);
if (value1 != 0)//被除数不能为零

20
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSNoticeDetailsData.aspx.cs
View File

@ -92,8 +92,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value1 = managementList1.Count();
value2 = totalManagementList1.Count();
value3 = managementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value4 = totalManagementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value3 = managementList1.Count(x => x.IsOnceQualified == true);
value4 = totalManagementList1.Count(x => x.IsOnceQualified == true);
if (value1 != 0)//被除数不能为零
{
@ -119,8 +119,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value7 = managementList2.Count();
value8 = totalManagementList2.Count();
value9 = managementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value10 = totalManagementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value9 = managementList2.Count(x => x.IsOnceQualified == true);
value10 = totalManagementList2.Count(x => x.IsOnceQualified == true);
if (value7 != 0)//被除数不能为零
{
@ -146,8 +146,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value13 = managementList3.Count();
value14 = totalManagementList3.Count();
value15 = managementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value16 = totalManagementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value15 = managementList3.Count(x => x.IsOnceQualified == true);
value16 = totalManagementList3.Count(x => x.IsOnceQualified == true);
if (value13 != 0)//被除数不能为零
{
@ -173,8 +173,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value19 = managementList4.Count();
value20 = totalManagementList4.Count();
value21 = managementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value22 = totalManagementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value21 = managementList4.Count(x => x.IsOnceQualified == true);
value22 = totalManagementList4.Count(x => x.IsOnceQualified == true);
if (value19 != 0)//被除数不能为零
{
@ -200,8 +200,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value25 = managementList5.Count();
value26 = totalManagementList5.Count();
value27 = managementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value28 = totalManagementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value27 = managementList5.Count(x => x.IsOnceQualified == true);
value28 = totalManagementList5.Count(x => x.IsOnceQualified == true);
if (value25 != 0)//被除数不能为零
{

2
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -276,7 +276,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//一次共检合格数
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == null || x.IsOnceQualified == true
where x.IsOnceQualified == true
select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
////总数
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement

4
SGGL/FineUIPro.Web/common/mainIII.aspx.cs
View File

@ -55,7 +55,7 @@ namespace FineUIPro.Web.common
var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
//焊工过期人数统计
var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId
@ -63,7 +63,7 @@ namespace FineUIPro.Web.common
select x;
this.divHG.InnerHtml = welders.Count().ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
this.divNCR.InnerHtml = NCRManagements.Count().ToString();

4
SGGL/FineUIPro.Web/common/mainIV.aspx.cs
View File

@ -78,7 +78,7 @@ namespace FineUIPro.Web.common
select new { x.InspectionId, y.IsOnceQualified }).Distinct().ToList();
this.divZLGJ.InnerHtml = inspectionManagementDetails.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
//焊工过期人数统计
var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId
@ -92,7 +92,7 @@ namespace FineUIPro.Web.common
newWelders = newWelders.Distinct().ToList();
this.divHG.InnerHtml = newWelders.Count().ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
List<Model.Comprehensive_NCRManagement> newNCRManagements = new List<Model.Comprehensive_NCRManagement>();

10
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
View File

@ -26,7 +26,7 @@ namespace FineUIPro.Web
{
var db = new Model.SGGLDB(Funs.ConnString);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@ -284,7 +284,7 @@ namespace FineUIPro.Web
Model.SGGLDB db = Funs.DB;
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@ -340,7 +340,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetCnProList();
Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@ -384,7 +384,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetList();
Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@ -452,7 +452,7 @@ namespace FineUIPro.Web
foreach (var unitWork in unitWorks)
{
listCategories.Add(unitWork.UnitWorkName);
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && (x.IsOnceQualified == null || x.IsOnceQualified == true)).ToList();
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.IsOnceQualified == true).ToList();
var totalChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0)
{

4
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -44,9 +44,9 @@ namespace FineUIPro.Web.common
var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified== null || x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divNCR.InnerHtml = NCRManagements.Count().ToString();

2
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -894,7 +894,7 @@ namespace FineUIPro.Web.common
select x).Count().ToString();
var num2 = (from x in db.ProcessControl_InspectionManagement
where (x.IsOnceQualified == null || x.IsOnceQualified == true) && x.ProjectId == ProjectId
where x.IsOnceQualified == true && x.ProjectId == ProjectId
select x).Count();
zlgjfinishNumber = num2.ToString();

4
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -792,7 +792,7 @@ namespace FineUIPro.Web.common
zlgjallNumber = num1.ToString();
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.IsOnceQualified == true
select x).Count();
zlgjfinishNumber = num2.ToString();
@ -808,7 +808,7 @@ namespace FineUIPro.Web.common
zlgjallNumber = num1.ToString();
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
select x).Count();
zlgjfinishNumber = num2.ToString();

12
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
View File

@ -411,7 +411,7 @@ namespace FineUIPro.Web.common
// BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
// null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.IsOnceQualified == true
select x).Count();
result = num2;
@ -425,7 +425,7 @@ namespace FineUIPro.Web.common
int result = 0;
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
select x).Count();
result = num2;
@ -873,7 +873,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true
select x).Count();
}
else
@ -882,7 +882,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
select x).Count();
}
@ -927,7 +927,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
select x).Count();
}
else
@ -936,7 +936,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
select x).Count();
}

36
SGGL/Model/Model.cs
View File

@ -450327,6 +450327,10 @@ namespace Model
private System.Nullable<System.DateTime> _InspectionDate;
private System.Nullable<System.DateTime> _CompileDate;
private string _UnitId;
private string _UnitWorkId;
public View_MonthReport_InspectionManagement()
@ -450413,6 +450417,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
public System.Nullable<System.DateTime> CompileDate
{
get
{
return this._CompileDate;
}
set
{
if ((this._CompileDate != value))
{
this._CompileDate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string UnitId
{
get
{
return this._UnitId;
}
set
{
if ((this._UnitId != value))
{
this._UnitId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
public string UnitWorkId
{

22
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-10-23T02:17:32.2384443Z||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;</History>
<History>True|2025-10-24T07:59:19.4176668Z||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>10/23/2025 10:17:30</publishTime>
<publishTime>10/24/2025 15:59:16</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>10/23/2025 10:17:30</publishTime>
<publishTime>10/24/2025 15:59:16</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>10/23/2025 10:17:20</publishTime>
<publishTime>10/24/2025 15:58:53</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>10/23/2025 10:17:20</publishTime>
<publishTime>10/24/2025 15:58:53</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>10/23/2025 09:58:59</publishTime>
<publishTime>10/24/2025 15:58:47</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>10/23/2025 09:58:59</publishTime>
<publishTime>10/24/2025 15:58:47</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>10/23/2025 10:17:21</publishTime>
<publishTime>10/24/2025 15:58:57</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>10/23/2025 10:17:21</publishTime>
<publishTime>10/24/2025 15:58:57</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>10/23/2025 10:17:21</publishTime>
<publishTime>10/24/2025 15:58:56</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>10/23/2025 10:17:22</publishTime>
<publishTime>10/24/2025 15:58:58</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />