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

20241021 修改共检通知单

Browse Source
This commit is contained in:
毕文静
2024-10-21 16:29:59 +08:00
parent 66d458026e
commit abb15b53fc
11 changed files with 1724 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+5 -5
View File
@@ -333,7 +333,7 @@ namespace FineUIPro.Web
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "质量一次合格率";
var cns = BLL.CNProfessionalService.GetList();
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 == true
@@ -348,16 +348,16 @@ namespace FineUIPro.Web
double result = 0, result2 = 0;
foreach (var cn in cns)
{
listCategories.Add(cn.ProfessionalName);
var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
listCategories.Add(cn.DetectionItems);
var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList();
var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0)
{
var a = Convert.ToDouble(okChecks.Count);
var b = Convert.ToDouble(totalChecks.Count);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
if (cn.ProfessionalName.Contains("管道"))
if (cn.DetectionItems.Contains("管道"))
{
var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+7 -7
View File
@@ -707,14 +707,14 @@ namespace FineUIPro.Web.common
private void getInspectionManagementInfo()
{
var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
//var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList();
foreach (var item in q)
{
//获取专业
InspectionManagementZy += "'" + item.ProfessionalName + "',";
InspectionManagementZy += "'" + item.DetectionItems + "',";
//根据专业获取总计
//var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
@@ -725,18 +725,18 @@ namespace FineUIPro.Web.common
if (pids == null)
{
num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId
where x.CNProfessionalId == item.ControlId
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true
select x).Count();
}
else {
num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
select x).Count();
}