Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -315,7 +315,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
#endregion
|
||||
|
||||
//加载所有grid
|
||||
// lodAllGrid("1");
|
||||
// lodAllGrid("1");
|
||||
objType = "1";
|
||||
RegisterAsyncTask(new PageAsyncTask(lodAllGrid));
|
||||
}
|
||||
@@ -357,30 +357,30 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
|
||||
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
|
||||
var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
|
||||
var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 ).ToList();
|
||||
var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
|
||||
|
||||
var remarks = loadRemarksDt();
|
||||
var cqmsRemarks = cqmsRemarksDt();
|
||||
var generalPlanApproval = loadGeneralPlanApprovalDt();
|
||||
var generalPlanApproval = loadGeneralPlanApprovalDt();
|
||||
var majorPlanApproval = loadMajorPlanApprovalDt();
|
||||
var inspectionTestPlan = loadInspectionTestPlanDt();
|
||||
var designDetailsApprove = loadDesignDetailsApproveDt();
|
||||
var designDetailsApprove = loadDesignDetailsApproveDt();
|
||||
var reviewDrawings = loadReviewDrawingsDt();
|
||||
var designChangeOrder = loadDesignChangeOrderDt();
|
||||
var passWelder = loadPassWelderDt();
|
||||
var processControl_NondestructiveTest = loadProcessControl_NondestructiveTest_NewDt();
|
||||
var inspectionEquipment = LoadInspectionEquipmentDt();
|
||||
var measuringInspection = LoadMeasuringInspectionDt();
|
||||
var measuringInspection = LoadMeasuringInspectionDt();
|
||||
var checkLotBindStatisc = CheckLotBindStatiscDt();
|
||||
var pressureInspection = LoadPressureInspectionDt();
|
||||
var InspectionDataInspection = loadInspectionDataInspectionDt();
|
||||
var pipingInspection = LoadPipingInspectionDt();
|
||||
var specialInspection = LoadSpecialInspectionDt();
|
||||
var ncrManagementInspection = LoadNcrManagementInspectionDt();
|
||||
var qualityInspection = LoadQualityInspectionDt();
|
||||
var InspectionDataInspection = loadInspectionDataInspectionDt();
|
||||
var pipingInspection = LoadPipingInspectionDt();
|
||||
var specialInspection = LoadSpecialInspectionDt();
|
||||
var ncrManagementInspection = LoadNcrManagementInspectionDt();
|
||||
var qualityInspection = LoadQualityInspectionDt();
|
||||
var specialCheck = loadSpecialCheckDt();
|
||||
var fileReport = loadFileReportDt();
|
||||
await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection , qualityInspection, specialCheck, fileReport });
|
||||
var fileReport = loadFileReportDt();
|
||||
await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection, qualityInspection, specialCheck, fileReport });
|
||||
|
||||
var generalPlanApprovalData = await generalPlanApproval;
|
||||
var remarksData = await remarks;
|
||||
@@ -435,12 +435,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
if (generalPlanApprovalData != null)
|
||||
{
|
||||
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
Dictionary<string, int> Quantity1Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
|
||||
foreach (DataRow row in generalPlanApprovalData.Rows)
|
||||
{
|
||||
@@ -458,7 +458,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (ApprovalDate.HasValue && ApprovalDate.Value >= startDate && ApprovalDate.Value <= endDate)
|
||||
{
|
||||
Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var item in units21)
|
||||
@@ -493,13 +493,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
if (majorPlanApprovalData != null)
|
||||
{
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
int Quantity3Sum = 0;
|
||||
Dictionary<string, int> Quantity1Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity3Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity3Dic = new Dictionary<string, int>();
|
||||
foreach (DataRow row in majorPlanApprovalData.Rows)
|
||||
{
|
||||
string UnitId = row["UnitId"].ToString();
|
||||
@@ -561,7 +561,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Quantity3Sum += model.Quantity3.Value;
|
||||
}
|
||||
Grid3.DataSource = list;
|
||||
Grid3.DataBind();
|
||||
Grid3.DataBind();
|
||||
//合计
|
||||
JObject summary = new JObject();
|
||||
summary.Add("UnitOrMajor", "合计");
|
||||
@@ -573,7 +573,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
if (inspectionTestPlanData != null)
|
||||
{
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
//加载所有专业
|
||||
@@ -589,7 +589,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Quantity2Dic.Add(CNProfessionalId, 0);
|
||||
}
|
||||
Quantity2Dic[CNProfessionalId] = Quantity2Dic[CNProfessionalId] + 1;
|
||||
|
||||
|
||||
if (!Quantity1Dic.ContainsKey(CNProfessionalId))
|
||||
{
|
||||
Quantity1Dic.Add(CNProfessionalId, 0);
|
||||
@@ -641,9 +641,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
if (designDetailsApproveData != null)
|
||||
{
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
Dictionary<string, int> Quantity1Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
|
||||
@@ -689,9 +689,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
model.Remarks = remarksDic[item.ProfessionalName + "3"];
|
||||
}
|
||||
list.Add(model);
|
||||
list.Add(model);
|
||||
Quantity1Sum += model.Quantity1.Value;
|
||||
Quantity2Sum += model.Quantity2.Value;
|
||||
Quantity2Sum += model.Quantity2.Value;
|
||||
}
|
||||
Grid5.DataSource = list;
|
||||
Grid5.DataBind();
|
||||
@@ -704,7 +704,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
|
||||
if (reviewDrawingsData != null)
|
||||
{
|
||||
{
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
@@ -767,7 +767,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
if (designChangeOrderData != null)
|
||||
{
|
||||
int Quantity1Sum = 0, Quantity2Sum = 0, Quantity3Sum = 0, Quantity4Sum = 0, Quantity5Sum = 0, Quantity6Sum = 0;
|
||||
int Quantity1Sum = 0, Quantity2Sum = 0, Quantity3Sum = 0, Quantity4Sum = 0, Quantity5Sum = 0, Quantity6Sum = 0;
|
||||
DateTime projectStartDate = Convert.ToDateTime("2015-01-01");
|
||||
List<Model.CheckStatisc> StatisticsList = new List<Model.CheckStatisc>();
|
||||
Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
|
||||
@@ -790,12 +790,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
string CNProfessionalId = row["CNProfessionalId"].ToString();
|
||||
string ImplementationFrontState = row["ImplementationFrontState"].ToString();
|
||||
DateTime? IssuedDate = Funs.GetNewDateTime(row["IssuedDate"].ToString());
|
||||
string ApprovalDate = row["ApprovalDate"].ToString() ;
|
||||
|
||||
string ApprovalDate = row["ApprovalDate"].ToString();
|
||||
|
||||
if (!Quantity1Dic.ContainsKey(CNProfessionalId))
|
||||
{
|
||||
Quantity1Dic.Add(CNProfessionalId, 0);
|
||||
}
|
||||
}
|
||||
if (!Quantity2Dic.ContainsKey(CNProfessionalId))
|
||||
{
|
||||
Quantity2Dic.Add(CNProfessionalId, 0);
|
||||
@@ -837,7 +837,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
Quantity3Dic[CNProfessionalId] = Quantity3Dic[CNProfessionalId] + 1;
|
||||
}
|
||||
if(ImplementationFrontState== "已完成")
|
||||
if (ImplementationFrontState == "已完成")
|
||||
{
|
||||
Quantity5Dic[CNProfessionalId] = Quantity5Dic[CNProfessionalId] + 1;
|
||||
}
|
||||
@@ -858,9 +858,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
|
||||
checkStatisc.Num = i;
|
||||
checkStatisc.WorkName = item.ProfessionalName;
|
||||
|
||||
|
||||
checkStatisc.OneOKRate = "0";
|
||||
checkStatisc.TotalOneOKRate ="0";
|
||||
checkStatisc.TotalOneOKRate = "0";
|
||||
if (Quantity1Dic.ContainsKey(item.CNProfessionalId))
|
||||
{
|
||||
checkStatisc.CheckNum = Quantity1Dic[item.CNProfessionalId];
|
||||
@@ -997,10 +997,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
foreach (var item in units2)
|
||||
{
|
||||
|
||||
|
||||
Model.PassWelderStatisc passWelderStatisc = new Model.PassWelderStatisc();
|
||||
passWelderStatisc.Num = i;
|
||||
passWelderStatisc.UnitName = item.UnitName;
|
||||
@@ -1226,7 +1226,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (inspectionEquipmentData != null)
|
||||
{
|
||||
var list = new List<Model.Report_Construction_Plan>();
|
||||
|
||||
|
||||
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
@@ -1300,12 +1300,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Quantity2Sum += model.Quantity2.Value;
|
||||
}
|
||||
Grid11.DataSource = list;
|
||||
Grid11.DataBind();
|
||||
Grid11.DataBind();
|
||||
//合计
|
||||
JObject summary = new JObject();
|
||||
summary.Add("UnitOrMajor", "合计");
|
||||
summary.Add("Quantity1", Quantity1Sum.ToString());
|
||||
summary.Add("Quantity2", Quantity2Sum.ToString());
|
||||
summary.Add("Quantity2", Quantity2Sum.ToString());
|
||||
Grid11.SummaryData = summary;
|
||||
}
|
||||
|
||||
@@ -1495,7 +1495,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
|
||||
foreach (Model.CheckStatisc cs in StatisticsListCV)
|
||||
{
|
||||
{
|
||||
if (cs.CheckNum != 0)//被除数不能为零
|
||||
{
|
||||
cs.OneOKRate = Math.Round((double)cs.OKNum / (double)cs.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
|
||||
@@ -1583,7 +1583,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
if (TotalCheckNumEQ != 0)//被除数不能为零
|
||||
{
|
||||
TotalOneOKRateEQ = Math.Round((double)TotalOKNumEQ / (double)TotalCheckNumEQ * 100, 2) + "%";//保留两位小数、后四舍五入
|
||||
TotalOneOKRateEQ = Math.Round((double)TotalOKNumEQ / (double)TotalCheckNumEQ * 100, 2) + "%";//保留两位小数、后四舍五入
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1905,7 +1905,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (InspectionDataInspectionData != null)
|
||||
{
|
||||
var list = new List<Model.CheckStatisc>();
|
||||
|
||||
|
||||
|
||||
int CheckNum = 0;//本月检查点数
|
||||
int TotalCheckNum = 0;//累计检查点数
|
||||
@@ -1957,10 +1957,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
foreach (var item in units21)
|
||||
{
|
||||
|
||||
|
||||
|
||||
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
|
||||
checkStatisc.Id = Guid.NewGuid().ToString();
|
||||
@@ -2005,7 +2005,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
OKNum += checkStatisc.OKNum;
|
||||
TotalOKNum += checkStatisc.TotalOKNum;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
gvInspectionDataInspection.DataSource = list;
|
||||
@@ -2044,21 +2044,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (pressureInspectionData != null)
|
||||
{
|
||||
var list = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
|
||||
|
||||
|
||||
int Quantity0Sum = 0;
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
|
||||
|
||||
|
||||
Dictionary<string, int> Quantity1Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity3Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity3Dic = new Dictionary<string, int>();
|
||||
foreach (DataRow row in pressureInspectionData.Rows)
|
||||
{
|
||||
string UnitId = row["UnitId"].ToString();
|
||||
int ActualNumber = Funs.GetNewIntOrZero(row["ActualNumber"].ToString());
|
||||
int PressurePipeNumber = Funs.GetNewIntOrZero( row["PressurePipeNumber"].ToString());
|
||||
int PressurePipeNumber = Funs.GetNewIntOrZero(row["PressurePipeNumber"].ToString());
|
||||
DateTime? ReportTime = Funs.GetNewDateTime(row["ReportTime"].ToString());
|
||||
if (!Quantity1Dic.ContainsKey(UnitId))
|
||||
{
|
||||
@@ -2080,10 +2080,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
}
|
||||
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
foreach (var item in units21)
|
||||
{
|
||||
{
|
||||
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
|
||||
model.Id = Guid.NewGuid().ToString();
|
||||
model.ContentName = item.UnitName;
|
||||
@@ -2106,7 +2106,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Quantity0Sum += model.TotalNoBackCount.Value;
|
||||
Quantity1Sum += model.MonthsCount.Value;
|
||||
Quantity2Sum += model.ProjectCount.Value;
|
||||
|
||||
|
||||
}
|
||||
gvPressureInspection.DataSource = list;
|
||||
gvPressureInspection.DataBind();
|
||||
@@ -2123,10 +2123,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
if (pipingInspectionData != null)
|
||||
{
|
||||
var list = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
var list = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
int Quantity0Sum = 0;
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
Dictionary<string, int> Quantity1Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity2Dic = new Dictionary<string, int>();
|
||||
Dictionary<string, int> Quantity3Dic = new Dictionary<string, int>();
|
||||
@@ -2160,7 +2160,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
foreach (var item in units21)
|
||||
{
|
||||
|
||||
|
||||
|
||||
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
|
||||
model.Id = Guid.NewGuid().ToString();
|
||||
@@ -2280,7 +2280,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (ncrManagementInspectionData != null)
|
||||
{
|
||||
List<Model.NCRReportStatisc> StatisticsList = new List<Model.NCRReportStatisc>();
|
||||
|
||||
|
||||
|
||||
int CurrentPeriodOkNumSum = 0;
|
||||
int OKNumSum = 0;
|
||||
@@ -2329,11 +2329,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + 1;
|
||||
}
|
||||
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
|
||||
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (var item in units)
|
||||
{
|
||||
{
|
||||
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
|
||||
NCRStatisc.Id = Guid.NewGuid().ToString();
|
||||
NCRStatisc.WorkName = item.UnitName;
|
||||
@@ -2357,7 +2357,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
CurrentPeriodOkNumSum += NCRStatisc.CurrentPeriodOkNum;
|
||||
OKNumSum += NCRStatisc.OKNum;
|
||||
CheckNumSum += NCRStatisc.CheckNum;
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (CheckNumSum != 0)//被除数不能为零
|
||||
@@ -2431,7 +2431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
foreach (var item in units21)
|
||||
{
|
||||
|
||||
var ClosedCount = 0;
|
||||
var ClosedCount = 0;
|
||||
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
|
||||
model.Id = Guid.NewGuid().ToString();
|
||||
model.ContentName = item.UnitName;
|
||||
@@ -2444,7 +2444,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
model.ProjectCount = Quantity2Dic[item.UnitId];
|
||||
if (model.ProjectCount.Value > 0)
|
||||
{
|
||||
model.RectificationRate = (100.0 * (ClosedCount/ model.ProjectCount.Value)).ToString("#0.00") + "%";
|
||||
model.RectificationRate = (100.0 * (ClosedCount / model.ProjectCount.Value)).ToString("#0.00") + "%";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2493,7 +2493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
if (specialCheckData != null)
|
||||
{
|
||||
var list = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
|
||||
|
||||
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
@@ -2503,7 +2503,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
string CheckType = row["CheckType"].ToString();
|
||||
DateTime? CheckDate = Funs.GetNewDateTime(row["CheckDate"].ToString());
|
||||
|
||||
|
||||
if (!Quantity1Dic.ContainsKey(CheckType))
|
||||
{
|
||||
Quantity1Dic.Add(CheckType, 0);
|
||||
@@ -2512,21 +2512,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
Quantity2Dic.Add(CheckType, 0);
|
||||
}
|
||||
|
||||
|
||||
if (CheckDate.HasValue && CheckDate.Value >= startDate && CheckDate.Value <= endDate)
|
||||
{
|
||||
Quantity1Dic[CheckType] = Quantity1Dic[CheckType] + 1;
|
||||
|
||||
}
|
||||
Quantity2Dic[CheckType] = Quantity2Dic[CheckType] + 1;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
//加载检查类别
|
||||
var lists = BLL.JointCheckService.GetCheckTypeList();
|
||||
foreach (var item in lists)
|
||||
{
|
||||
{
|
||||
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
|
||||
model.Id = Guid.NewGuid().ToString();
|
||||
model.ContentName = item.Value;
|
||||
@@ -2648,7 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
|
||||
model.Id = Guid.NewGuid().ToString();
|
||||
model.ContentName = item.UnitName;
|
||||
model.MonthsCount =0;
|
||||
model.MonthsCount = 0;
|
||||
model.ProjectCount = 0;
|
||||
model.MonthsBackCount = 0;
|
||||
model.TotalNoBackCount = 0;
|
||||
@@ -2657,7 +2657,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
model.MonthsCount = Quantity2Dic[item.UnitId];
|
||||
model.ProjectCount = Quantity1Dic[item.UnitId];
|
||||
model.MonthsBackCount = Quantity3Dic[item.UnitId];
|
||||
model.TotalNoBackCount = Quantity1Dic[item.UnitId]-Quantity4Dic[item.UnitId];
|
||||
model.TotalNoBackCount = Quantity1Dic[item.UnitId] - Quantity4Dic[item.UnitId];
|
||||
}
|
||||
|
||||
model.ReportId = ReportId;
|
||||
@@ -2778,14 +2778,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
if (AddOrUpdate == "update")
|
||||
{
|
||||
// lodAllGrid("1");
|
||||
// lodAllGrid("1");
|
||||
objType = "1";
|
||||
RegisterAsyncTask(new PageAsyncTask(lodAllGrid));
|
||||
PageContext.RegisterStartupScript("rehiden();");
|
||||
}
|
||||
else
|
||||
{
|
||||
// lodAllGrid("0");
|
||||
// lodAllGrid("0");
|
||||
objType = "0";
|
||||
RegisterAsyncTask(new PageAsyncTask(lodAllGrid));
|
||||
PageContext.RegisterStartupScript("rehiden();");
|
||||
@@ -2881,9 +2881,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
foreach (var item in generalPlanUnits)
|
||||
{
|
||||
|
||||
var query = from c in db.Comprehensive_GeneralPlanApproval
|
||||
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
|
||||
from u in unitJoin.DefaultIfEmpty()
|
||||
var query = from c in db.Comprehensive_GeneralPlanApproval
|
||||
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
|
||||
from u in unitJoin.DefaultIfEmpty()
|
||||
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
|
||||
select new
|
||||
|
||||
@@ -2947,7 +2947,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
return dt;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region 3.2 危大工程方案审批情况 Grid3方法
|
||||
@@ -3047,7 +3047,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -3065,7 +3065,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
int Quantity1Sum = 0;
|
||||
int Quantity2Sum = 0;
|
||||
//加载所有专业
|
||||
|
||||
|
||||
|
||||
|
||||
foreach (var item in CNProfessionals)
|
||||
@@ -3140,7 +3140,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
return dt;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region 4 设计交底管理情况 Grid5方法
|
||||
@@ -3450,7 +3450,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
join p in db.Base_Post on c.PostId equals p.PostId into postJoin
|
||||
from p in postJoin.DefaultIfEmpty()
|
||||
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
|
||||
select new
|
||||
select new
|
||||
{
|
||||
c.InspectionPersonId,
|
||||
c.ProjectId,
|
||||
@@ -3859,7 +3859,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
|
||||
string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate
|
||||
from ProcessControl_NondestructiveTest_New
|
||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='"+ startDate + "' and CreateDate <='"+ endDate + "'";
|
||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='" + startDate + "' and CreateDate <='" + endDate + "'";
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||
return dt;
|
||||
});
|
||||
@@ -4170,8 +4170,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 == true);
|
||||
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true);
|
||||
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
|
||||
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
|
||||
|
||||
if (checkStatisc.CheckNum != 0)//被除数不能为零
|
||||
{
|
||||
@@ -4302,8 +4302,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 == true);
|
||||
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
|
||||
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));
|
||||
|
||||
if (checkStatisc.CheckNum != 0)//被除数不能为零
|
||||
{
|
||||
@@ -4494,7 +4494,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
|
||||
|
||||
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate 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
|
||||
@@ -4673,7 +4673,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
async Task<DataTable> LoadPipingInspectionDt()
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
{
|
||||
string strSql = @"select UnitId, PackageNumber,IssuedReportNumber, ReportTime from Comprehensive_PressurePipe
|
||||
where Projctid='" + this.CurrUser.LoginProjectId + "' ";
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||
@@ -4823,7 +4823,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
|
||||
NCRStatisc.Id = Guid.NewGuid().ToString();
|
||||
NCRStatisc.WorkName = item.UnitName;
|
||||
|
||||
|
||||
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
|
||||
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
|
||||
|
||||
@@ -5728,7 +5728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
//BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region 保存所有子表
|
||||
|
||||
|
||||
@@ -5798,11 +5798,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
////保存23.施工照片
|
||||
//saveImages();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
if (save)
|
||||
{
|
||||
ShowNotify("保存成功！", MessageBoxIcon.Success);
|
||||
@@ -6227,9 +6227,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
#endregion
|
||||
try
|
||||
{
|
||||
var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList();
|
||||
var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList();
|
||||
db.Report_TextBoxContent.DeleteAllOnSubmit(result);
|
||||
//TextBoxContentService.Delete(ReportId);
|
||||
//TextBoxContentService.Delete(ReportId);
|
||||
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
|
||||
db.SubmitChanges();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user