From 1c0cdfc7e37d0f08163fec05799522c148b564ec Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 12 Sep 2023 15:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9wbs=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/DigData/CQMSDataCollectService.cs | 1078 ++++++++++++++--- SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs | 2 +- .../CQMS/WBS/ControlItemAndCycle.aspx.cs | 2 +- .../CQMS/WBS/ControlItemAndCycleShow.aspx.cs | 2 +- SGGL/FineUIPro.Web/common/Menu_DigData.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 2 +- SGGL/FineUIPro.Web/common/Menu_PZHGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 25 +- 8 files changed, 924 insertions(+), 194 deletions(-) diff --git a/SGGL/BLL/DigData/CQMSDataCollectService.cs b/SGGL/BLL/DigData/CQMSDataCollectService.cs index 773dd92a..a079ce4e 100644 --- a/SGGL/BLL/DigData/CQMSDataCollectService.cs +++ b/SGGL/BLL/DigData/CQMSDataCollectService.cs @@ -376,20 +376,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month1) + a; getItem18.Month1 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month1 = (Funs.GetNewIntOrZero(getItem19.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month1 = (Funs.GetNewIntOrZero(getItem19.Month1) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month1) + a; getItem20.Month1 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -400,21 +416,37 @@ namespace BLL getItem21.Month1 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month1) + b; getItem22.Month1 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month1 = (Funs.GetNewIntOrZero(getItem23.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month1 = (Funs.GetNewIntOrZero(getItem23.Month1) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month1) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month1) + b; getItem24.Month1 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -462,7 +494,6 @@ namespace BLL } #endregion #region 二月份 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -603,20 +634,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month2) + a; getItem18.Month2 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month2 = (Funs.GetNewIntOrZero(getItem19.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month2 = (Funs.GetNewIntOrZero(getItem19.Month2) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month2) + a; getItem20.Month2 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -627,21 +674,37 @@ namespace BLL getItem21.Month2 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month2) + b; getItem22.Month2 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month2 = (Funs.GetNewIntOrZero(getItem23.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month2 = (Funs.GetNewIntOrZero(getItem23.Month2) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month2) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month2) + b; getItem24.Month2 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -655,7 +718,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 3) @@ -690,7 +752,6 @@ namespace BLL } #endregion #region 三月份 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -831,20 +892,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month3) + a; getItem18.Month3 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month3 = (Funs.GetNewIntOrZero(getItem19.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month3 = (Funs.GetNewIntOrZero(getItem19.Month3) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month3) + a; getItem20.Month3 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -855,21 +932,37 @@ namespace BLL getItem21.Month3 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month3) + b; getItem22.Month3 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month3 = (Funs.GetNewIntOrZero(getItem23.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month3 = (Funs.GetNewIntOrZero(getItem23.Month3) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month3) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month3) + b; getItem24.Month3 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -883,7 +976,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 4) @@ -918,7 +1010,6 @@ namespace BLL } #endregion #region 四月份 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -1059,20 +1150,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month4) + a; getItem18.Month4 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month4 = (Funs.GetNewIntOrZero(getItem19.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month4 = (Funs.GetNewIntOrZero(getItem19.Month4) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month4) + a; getItem20.Month4 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -1083,21 +1190,37 @@ namespace BLL getItem21.Month4 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month4) + b; getItem22.Month4 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month4 = (Funs.GetNewIntOrZero(getItem23.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month4 = (Funs.GetNewIntOrZero(getItem23.Month4) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month4) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month4) + b; getItem24.Month4 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -1111,7 +1234,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 5) @@ -1146,7 +1268,6 @@ namespace BLL } #endregion #region 五月份 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -1287,20 +1408,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month5) + a; getItem18.Month5 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month5 = (Funs.GetNewIntOrZero(getItem19.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month5 = (Funs.GetNewIntOrZero(getItem19.Month5) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month5) + a; getItem20.Month5 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -1311,21 +1448,37 @@ namespace BLL getItem21.Month5 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month5) + b; getItem22.Month5 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month5 = (Funs.GetNewIntOrZero(getItem23.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month5 = (Funs.GetNewIntOrZero(getItem23.Month5) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month5) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month5) + b; getItem24.Month5 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -1339,7 +1492,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 6) @@ -1374,7 +1526,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -1515,20 +1666,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month6) + a; getItem18.Month6 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month6 = (Funs.GetNewIntOrZero(getItem19.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month6 = (Funs.GetNewIntOrZero(getItem19.Month6) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month6) + a; getItem20.Month6 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -1539,21 +1706,37 @@ namespace BLL getItem21.Month6 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month6) + b; getItem22.Month6 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month6 = (Funs.GetNewIntOrZero(getItem23.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month6 = (Funs.GetNewIntOrZero(getItem23.Month6) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month6) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month6) + b; getItem24.Month6 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -1567,7 +1750,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 7) @@ -1602,7 +1784,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -1743,20 +1924,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month7) + a; getItem18.Month7 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month7 = (Funs.GetNewIntOrZero(getItem19.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month7 = (Funs.GetNewIntOrZero(getItem19.Month7) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month7) + a; getItem20.Month7 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -1767,21 +1964,37 @@ namespace BLL getItem21.Month7 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month7) + b; getItem22.Month7 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month7 = (Funs.GetNewIntOrZero(getItem23.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month7 = (Funs.GetNewIntOrZero(getItem23.Month7) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month7) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month7) + b; getItem24.Month7 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -1795,7 +2008,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 8) @@ -1830,7 +2042,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -1971,20 +2182,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month8) + a; getItem18.Month8 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month8 = (Funs.GetNewIntOrZero(getItem19.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month8 = (Funs.GetNewIntOrZero(getItem19.Month8) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month8) + a; getItem20.Month8 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -1995,21 +2222,37 @@ namespace BLL getItem21.Month8 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month8) + b; getItem22.Month8 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month8 = (Funs.GetNewIntOrZero(getItem23.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month8 = (Funs.GetNewIntOrZero(getItem23.Month8) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month8) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month8) + b; getItem24.Month8 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -2023,7 +2266,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 9) @@ -2058,7 +2300,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -2199,20 +2440,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month9) + a; getItem18.Month9 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month9 = (Funs.GetNewIntOrZero(getItem19.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month9 = (Funs.GetNewIntOrZero(getItem19.Month9) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month9) + a; getItem20.Month9 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -2223,21 +2480,37 @@ namespace BLL getItem21.Month9 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month9) + b; getItem22.Month9 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month9 = (Funs.GetNewIntOrZero(getItem23.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month9 = (Funs.GetNewIntOrZero(getItem23.Month9) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month9) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month9) + b; getItem24.Month9 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -2251,7 +2524,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 10) @@ -2286,7 +2558,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -2427,20 +2698,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month10) + a; getItem18.Month10 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month10 = (Funs.GetNewIntOrZero(getItem19.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month10 = (Funs.GetNewIntOrZero(getItem19.Month10) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month10) + a; getItem20.Month10 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -2451,21 +2738,37 @@ namespace BLL getItem21.Month10 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month10) + b; getItem22.Month10 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month10 = (Funs.GetNewIntOrZero(getItem23.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month10 = (Funs.GetNewIntOrZero(getItem23.Month10) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month10) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month10) + b; getItem24.Month10 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -2479,7 +2782,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 11) @@ -2514,7 +2816,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -2655,20 +2956,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month11) + a; getItem18.Month11 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month11 = (Funs.GetNewIntOrZero(getItem19.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month11 = (Funs.GetNewIntOrZero(getItem19.Month11) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month11) + a; getItem20.Month11 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -2679,21 +2996,37 @@ namespace BLL getItem21.Month11 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month11) + b; getItem22.Month11 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month11 = (Funs.GetNewIntOrZero(getItem23.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month11 = (Funs.GetNewIntOrZero(getItem23.Month11) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month11) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month11) + b; getItem24.Month11 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -2707,7 +3040,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } else if (monthReport.Months.Value.Month == 12) @@ -2742,7 +3074,6 @@ namespace BLL } #endregion #region 数据汇总 - if (isSave) { ////质量缺陷/不合格项整改关闭情况 @@ -2883,20 +3214,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month12) + a; getItem18.Month12 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month12 = (Funs.GetNewIntOrZero(getItem19.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month12 = (Funs.GetNewIntOrZero(getItem19.Month12) + a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month12) + a; getItem20.Month12 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -2907,21 +3254,37 @@ namespace BLL getItem21.Month12 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month12) + b; getItem22.Month12 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month12 = (Funs.GetNewIntOrZero(getItem23.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month12 = (Funs.GetNewIntOrZero(getItem23.Month12) + b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month12) + monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month12) + b; getItem24.Month12 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -2935,7 +3298,6 @@ namespace BLL } db.SubmitChanges(); } - #endregion } } @@ -3116,20 +3478,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month1) - a; getItem18.Month1 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month1 = (Funs.GetNewIntOrZero(getItem19.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month1 = (Funs.GetNewIntOrZero(getItem19.Month1) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month1) - a; getItem20.Month1 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -3140,21 +3518,37 @@ namespace BLL getItem21.Month1 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month1) - b; getItem22.Month1 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month1 = (Funs.GetNewIntOrZero(getItem23.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month1 = (Funs.GetNewIntOrZero(getItem23.Month1) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month1) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month1) - b; getItem24.Month1 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -3320,20 +3714,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month2) - a; getItem18.Month2 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month2 = (Funs.GetNewIntOrZero(getItem19.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month2 = (Funs.GetNewIntOrZero(getItem19.Month2) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month2) - a; getItem20.Month2 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -3344,21 +3754,37 @@ namespace BLL getItem21.Month2 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month2) - b; getItem22.Month2 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month2 = (Funs.GetNewIntOrZero(getItem23.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month2 = (Funs.GetNewIntOrZero(getItem23.Month2) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month2) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month2) - b; getItem24.Month2 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -3523,20 +3949,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month3) - a; getItem18.Month3 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month3 = (Funs.GetNewIntOrZero(getItem19.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month3 = (Funs.GetNewIntOrZero(getItem19.Month3) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month3) - a; getItem20.Month3 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -3547,21 +3989,37 @@ namespace BLL getItem21.Month3 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month3) - b; getItem22.Month3 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month3 = (Funs.GetNewIntOrZero(getItem23.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month3 = (Funs.GetNewIntOrZero(getItem23.Month3) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month3) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month3) - b; getItem24.Month3 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -3726,20 +4184,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month4) - a; getItem18.Month4 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month4 = (Funs.GetNewIntOrZero(getItem19.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month4 = (Funs.GetNewIntOrZero(getItem19.Month4) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month4) - a; getItem20.Month4 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -3750,21 +4224,37 @@ namespace BLL getItem21.Month4 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month4) - b; getItem22.Month4 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month4 = (Funs.GetNewIntOrZero(getItem23.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month4 = (Funs.GetNewIntOrZero(getItem23.Month4) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month4) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month4) - b; getItem24.Month4 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -3929,20 +4419,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month5) - a; getItem18.Month5 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month5 = (Funs.GetNewIntOrZero(getItem19.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month5 = (Funs.GetNewIntOrZero(getItem19.Month5) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month5) - a; getItem20.Month5 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -3953,21 +4459,37 @@ namespace BLL getItem21.Month5 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month5) - b; getItem22.Month5 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month5 = (Funs.GetNewIntOrZero(getItem23.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month5 = (Funs.GetNewIntOrZero(getItem23.Month5) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month5) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month5) - b; getItem24.Month5 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -4132,20 +4654,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month6) - a; getItem18.Month6 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month6 = (Funs.GetNewIntOrZero(getItem19.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month6 = (Funs.GetNewIntOrZero(getItem19.Month6) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month6) - a; getItem20.Month6 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -4156,21 +4694,37 @@ namespace BLL getItem21.Month6 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month6) - b; getItem22.Month6 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month6 = (Funs.GetNewIntOrZero(getItem23.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month6 = (Funs.GetNewIntOrZero(getItem23.Month6) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month6) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month6) - b; getItem24.Month6 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -4335,20 +4889,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month7) - a; getItem18.Month7 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month7 = (Funs.GetNewIntOrZero(getItem19.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month7 = (Funs.GetNewIntOrZero(getItem19.Month7) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month7) - a; getItem20.Month7 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -4359,21 +4929,37 @@ namespace BLL getItem21.Month7 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month7) - b; getItem22.Month7 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month7 = (Funs.GetNewIntOrZero(getItem23.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month7 = (Funs.GetNewIntOrZero(getItem23.Month7) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month7) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month7) - b; getItem24.Month7 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -4538,20 +5124,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month8) - a; getItem18.Month8 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month8 = (Funs.GetNewIntOrZero(getItem19.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month8 = (Funs.GetNewIntOrZero(getItem19.Month8) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month8) - a; getItem20.Month8 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -4562,21 +5164,37 @@ namespace BLL getItem21.Month8 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month8) - b; getItem22.Month8 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month8 = (Funs.GetNewIntOrZero(getItem23.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month8 = (Funs.GetNewIntOrZero(getItem23.Month8) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month8) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month8) - b; getItem24.Month8 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -4741,20 +5359,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month9) - a; getItem18.Month9 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month9 = (Funs.GetNewIntOrZero(getItem19.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month9 = (Funs.GetNewIntOrZero(getItem19.Month9) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month9) - a; getItem20.Month9 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -4765,21 +5399,37 @@ namespace BLL getItem21.Month9 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month9) - b; getItem22.Month9 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month9 = (Funs.GetNewIntOrZero(getItem23.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month9 = (Funs.GetNewIntOrZero(getItem23.Month9) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month9) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month9) - b; getItem24.Month9 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -4944,20 +5594,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month10) - a; getItem18.Month10 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month10 = (Funs.GetNewIntOrZero(getItem19.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month10 = (Funs.GetNewIntOrZero(getItem19.Month10) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month10) - a; getItem20.Month10 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -4968,21 +5634,37 @@ namespace BLL getItem21.Month10 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month10) - b; getItem22.Month10 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month10 = (Funs.GetNewIntOrZero(getItem23.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month10 = (Funs.GetNewIntOrZero(getItem23.Month10) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month10) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month10) - b; getItem24.Month10 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -5147,20 +5829,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month11) - a; getItem18.Month11 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month11 = (Funs.GetNewIntOrZero(getItem19.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month11 = (Funs.GetNewIntOrZero(getItem19.Month11) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month11) - a; getItem20.Month11 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -5171,21 +5869,37 @@ namespace BLL getItem21.Month11 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month11) - b; getItem22.Month11 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month11 = (Funs.GetNewIntOrZero(getItem23.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month11 = (Funs.GetNewIntOrZero(getItem23.Month11) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month11) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month11) - b; getItem24.Month11 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); @@ -5350,20 +6064,36 @@ namespace BLL { int ATotalSpotNum = 0, ATotalOKNum = 0, BTotalSpotNum = 0, BTotalOKNum = 0; var getItem18 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 18); + var As = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")); if (getItem18 != null) { - ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalNum); + } + ATotalSpotNum = Funs.GetNewIntOrZero(getItem18.Month12) - a; getItem18.Month12 = ATotalSpotNum.ToString(); } var getItem19 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 19); if (getItem19 != null) { - getItem19.Month12 = (Funs.GetNewIntOrZero(getItem19.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem19.Month12 = (Funs.GetNewIntOrZero(getItem19.Month12) - a).ToString(); } var getItem20 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 20); if (getItem20 != null) { - ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("A")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int a = 0; + foreach (var item in As) + { + a += Funs.GetNewIntOrZero(item.TotalOKNum); + } + ATotalOKNum = Funs.GetNewIntOrZero(getItem20.Month12) - a; getItem20.Month12 = ATotalOKNum.ToString(); } var getItem21 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 21); @@ -5374,21 +6104,37 @@ namespace BLL getItem21.Month12 = (Convert.ToDecimal(ATotalOKNum) / Convert.ToDecimal(ATotalSpotNum) * 100).ToString("0.##") + "%"; } } + var Bs = monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")); var getItem22 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 22); if (getItem22 != null) { - BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalNum); + } + BTotalSpotNum = Funs.GetNewIntOrZero(getItem22.Month12) - b; getItem22.Month12 = BTotalSpotNum.ToString(); } var getItem23 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 23); if (getItem23 != null) { - getItem23.Month12 = (Funs.GetNewIntOrZero(getItem23.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.ThisOKNum))).ToString(); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.ThisOKNum); + } + getItem23.Month12 = (Funs.GetNewIntOrZero(getItem23.Month12) - b).ToString(); } var getItem24 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 24); if (getItem24 != null) { - BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month12) - monthSpotCheckDetails.Where(x => x.ControlPoint.Contains("B")).Sum(x => Funs.GetNewIntOrZero(x.TotalOKNum)); + int b = 0; + foreach (var item in Bs) + { + b += Funs.GetNewIntOrZero(item.TotalOKNum); + } + BTotalOKNum = Funs.GetNewIntOrZero(getItem24.Month12) - b; getItem24.Month12 = BTotalOKNum.ToString(); } var getItem25 = getCQMSDataCollectItemYear.FirstOrDefault(x => x.SortIndex == 25); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs index d2f0666b..994b7ff1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs @@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Check } else if (e.Node.CommandName == "WorkPackage") //展开工作包节点 { - var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x; + var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x; if (workPackages.Count() > 0) //存在子单位工程 { foreach (var workPackage in workPackages) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs index 46214861..af400688 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs @@ -166,7 +166,7 @@ namespace FineUIPro.Web.CQMS.WBS } else if (e.Node.CommandName == "WorkPackage") //展开工作包节点 { - var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x; + var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x; if (workPackages.Count() > 0) //存在子单位工程 { foreach (var workPackage in workPackages) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs index dd7ff903..73ef09b8 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs @@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.WBS } else if (e.Node.CommandName == "WorkPackage") //展开工作包节点 { - var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x; + var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x; if (workPackages.Count() > 0) //存在子单位工程 { foreach (var workPackage in workPackages) diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index 8eb9b3df..b532a9bb 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 8d4aa005..b241c0a1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,6 +1,6 @@  - + diff --git a/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml index e67fa0a1..2d485ade 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml @@ -13,6 +13,7 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 342d91b8..8cc2c0a1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -1,12 +1,8 @@  - - + + - - - - @@ -19,19 +15,11 @@ - + + - - - - - - - - - @@ -90,9 +78,4 @@ - - - - - \ No newline at end of file