焊接拍片数、合格数汇总

2025-07-01 17:13:29 +08:00
parent 037888ef1f
commit eba44201cb
6 changed files with 109 additions and 32 deletions
@@ -281,10 +281,11 @@ namespace BLL
            }
            if (hJGLDateType == HJGLDateType.NumberOfFilms || hJGLDateType == HJGLDateType.All)
            {
-                table.TotalFilmNum = GetTotalFilmNum(projectid);
-                table.OKFilmNum = GetOKFilmNum(projectid);
-
-
+                //table.TotalFilmNum = GetTotalFilmNum(projectid);
+                //table.OKFilmNum = GetOKFilmNum(projectid);
+                var filmObj = GetFilm(projectid);
+                table.TotalFilmNum = filmObj.CHT_TotalFilm;
+                table.OKFilmNum = filmObj.CHT_PassFilm;
            }
            if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
            {
@@ -373,6 +374,37 @@ namespace BLL
            }
            return result;
        }
+
+        /// <summary>
+        /// 获取焊接总片数信息数据
+        /// </summary>
+        /// <param name="projectid"></param>
+        /// <returns></returns>
+        public static CHCheckItemOutput GetFilm(string projectid)
+        {
+            var result = new CHCheckItemOutput();
+            var ndtLists = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid select x).ToList();
+
+            if (ndtLists.Count() > 0)
+            {
+                //取每个项目、单位、专业最新的一条数据
+                var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
+                decimal a = 0, b = 0;
+                foreach (var item in datalist)
+                {
+                    if (item.TotalQuantity.HasValue)
+                    {
+                        a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
+                        b += item.TotalQuantity.Value;
+                    }
+                }
+                result.CHT_TotalFilm = (int)Math.Round(b);
+                result.CHT_PassFilm = (int)Math.Round(a);
+            }
+
+            return result;
+        }
+
        /// <summary>
        /// 获取总片数
        /// </summary>