修改穿透页面
This commit is contained in:
parent
a82f96f3d2
commit
10d032e347
|
@ -122,6 +122,20 @@ namespace FineUIPro.Web.DataShow
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 定义变量
|
||||||
|
/// </summary>
|
||||||
|
private static IQueryable<Model.QualityAcceptanceItem> getDataItemLists = from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
||||||
|
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
||||||
|
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
||||||
|
select new Model.QualityAcceptanceItem
|
||||||
|
{
|
||||||
|
InspectionDetailId = x.InspectionDetailId,
|
||||||
|
ProjectId = z.ProjectId,
|
||||||
|
CheckAcceptType = z.CheckAcceptType,
|
||||||
|
IsOnceQualified = y.IsOnceQualified
|
||||||
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 数量
|
/// 数量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -132,11 +146,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
var getT = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue).Distinct().ToList();
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
cout1 = getT.Count();
|
cout1 = getT.Count();
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
|
@ -152,11 +162,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
var getT = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true).Distinct().ToList();
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue && y.IsOnceQualified == true
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
cout1 = getT.Count();
|
cout1 = getT.Count();
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
|
@ -172,16 +178,8 @@ namespace FineUIPro.Web.DataShow
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
var getT1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue).Distinct().ToList();
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true).Distinct().ToList();
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
var getT2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue && y.IsOnceQualified == true
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
cout1 = getT1.Count() - getT2.Count();
|
cout1 = getT1.Count() - getT2.Count();
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
|
@ -197,16 +195,8 @@ namespace FineUIPro.Web.DataShow
|
||||||
string rate = string.Empty;
|
string rate = string.Empty;
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
var getT1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue).Distinct().ToList();
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true).Distinct().ToList();
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
var getT2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
|
|
||||||
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
|
|
||||||
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
|
|
||||||
where z.ProjectId == projectId.ToString() && z.CheckAcceptType == this.rbType.SelectedValue && y.IsOnceQualified == true
|
|
||||||
select x).Distinct().ToList();
|
|
||||||
if (getT1.Count() > 0)
|
if (getT1.Count() > 0)
|
||||||
{
|
{
|
||||||
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();
|
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Model
|
||||||
|
{
|
||||||
|
public class QualityAcceptanceItem
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string InspectionDetailId
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string ProjectId
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string CheckAcceptType
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool? IsOnceQualified
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -173,6 +173,7 @@
|
||||||
<Compile Include="CQMS\NCRStatisc.cs" />
|
<Compile Include="CQMS\NCRStatisc.cs" />
|
||||||
<Compile Include="CQMS\NDTCheckItem.cs" />
|
<Compile Include="CQMS\NDTCheckItem.cs" />
|
||||||
<Compile Include="CQMS\PassWelderStatisc.cs" />
|
<Compile Include="CQMS\PassWelderStatisc.cs" />
|
||||||
|
<Compile Include="CQMS\QualityAcceptanceItem.cs" />
|
||||||
<Compile Include="CQMS\SteelItem.cs" />
|
<Compile Include="CQMS\SteelItem.cs" />
|
||||||
<Compile Include="CQMS\WelderItem.cs" />
|
<Compile Include="CQMS\WelderItem.cs" />
|
||||||
<Compile Include="DoorServer\AbsenceDutyItem.cs" />
|
<Compile Include="DoorServer\AbsenceDutyItem.cs" />
|
||||||
|
|
Loading…
Reference in New Issue