diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index b08ef4e2..cce304e6 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -357,6 +357,7 @@ 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 units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (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 remarks = loadRemarksDt();
@@ -461,7 +462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@@ -529,7 +530,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
model.Id = Guid.NewGuid().ToString();
@@ -1340,7 +1341,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -1956,12 +1957,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
-
-
- foreach (var item in units21)
+ foreach (var item in units22)
{
-
-
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
checkStatisc.Id = Guid.NewGuid().ToString();
checkStatisc.ReportId = ReportId;
@@ -1971,8 +1968,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = Quantity1Dic[item.UnitId];
checkStatisc.TotalCheckNum = Quantity2Dic[item.UnitId];
checkStatisc.OKNum = Quantity3Dic[item.UnitId]; ;
- checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId]; ;
-
+ checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId];
}
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -2004,8 +2000,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
OKNum += checkStatisc.OKNum;
TotalOKNum += checkStatisc.TotalOKNum;
-
-
}
gvInspectionDataInspection.DataSource = list;
@@ -2082,7 +2076,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2158,10 +2152,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
-
-
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName;
@@ -2238,7 +2230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2334,6 +2326,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units)
{
+ if (item.UnitId == Const.UnitId_CWCEC)
+ {
+ continue;
+ }
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
NCRStatisc.Id = Guid.NewGuid().ToString();
NCRStatisc.WorkName = item.UnitName;
@@ -2428,7 +2424,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
var ClosedCount = 0;
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 0f920afc..186966be 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -289,7 +289,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
//加载所有grid
- // lodAllGrid("1");
+ // lodAllGrid("1");
objType = "1";
RegisterAsyncTask(new PageAsyncTask(lodAllGrid));
}
@@ -324,11 +324,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// 加载grid
///
///
- async Task lodAllGrid()
+ async Task lodAllGrid()
{
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 units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (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 remarks = loadRemarksDt();
@@ -433,7 +434,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@@ -501,7 +502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
model.Id = Guid.NewGuid().ToString();
@@ -1312,7 +1313,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -1928,12 +1929,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
-
-
- foreach (var item in units21)
+ foreach (var item in units22)
{
-
-
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
checkStatisc.Id = Guid.NewGuid().ToString();
checkStatisc.ReportId = ReportId;
@@ -1976,8 +1973,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
OKNum += checkStatisc.OKNum;
TotalOKNum += checkStatisc.TotalOKNum;
-
-
}
gvInspectionDataInspection.DataSource = list;
@@ -2054,7 +2049,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2130,10 +2125,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
-
-
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName;
@@ -2210,7 +2203,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber;
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2306,6 +2299,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units)
{
+ if (item.UnitId == Const.UnitId_CWCEC)
+ {
+ continue;
+ }
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
NCRStatisc.Id = Guid.NewGuid().ToString();
NCRStatisc.WorkName = item.UnitName;
@@ -2400,9 +2397,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
- foreach (var item in units21)
+ foreach (var item in units22)
{
-
var ClosedCount = 0;
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2681,7 +2677,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//loadReviewDrawings(objType);
//6 加载设计变更管理情况
- // loadDesignChangeOrder();
+ // loadDesignChangeOrder();
//7.1 加载合格焊工管理情况
//loadPassWelder();
@@ -2690,27 +2686,27 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//loadProcessControl_NondestructiveTest_New();
//8 设备报验管理Grid11
- // LoadInspectionEquipment(objType);
+ // LoadInspectionEquipment(objType);
//加载9.计量器具报验管理情况
//loadMeasuringInspection(objType);
//加载10.现场质量共检数据
- // loadInspectionDataInspection(objType);
+ // loadInspectionDataInspection(objType);
//加载11.压力管道监检情况
- // loadPressureInspection(objType);
+ // loadPressureInspection(objType);
//加载12.管道试压包管理情况
- // loadPipingInspection(objType);
+ // loadPipingInspection(objType);
//加载13.特种设备监检情况
- // loadSpecialInspection(objType);
+ // loadSpecialInspection(objType);
////加载14.NCR管理情况
- // loadNcrManagementInspection(objType);
+ // loadNcrManagementInspection(objType);
//加载15.质量巡检情况
- // loadQualityInspection(objType);
+ // loadQualityInspection(objType);
//加载16.质量专项检查情况
- // loadSpecialCheck(objType);
+ // loadSpecialCheck(objType);
//加载17.质量文件上报情况
- // loadFileReport(objType);
+ // loadFileReport(objType);
}
#endregion
@@ -4138,7 +4134,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.ReportId = ReportId;
checkStatisc.WorkName = item.UnitName;
checkStatisc.CheckNum = monethCount.Count();
- checkStatisc.TotalCheckNum = AllList.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);
@@ -5738,10 +5734,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
////保存23.施工照片
//saveImages();
-
+
#endregion
-
+
}
#endregion
@@ -5776,9 +5772,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
try
{
- var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList();
+ var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList();
db.Report_CqmsTarget.DeleteAllOnSubmit(result);
- // CqmsTargetService.Delete(ReportId);
+ // CqmsTargetService.Delete(ReportId);
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
@@ -6161,9 +6157,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();
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 1a1a9a6c..17978b44 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true