fix(hjgl): 修复焊口打印与防腐数据处理

2026-08-13 16:58:22 +08:00
parent 5160dde702
commit 0fb67e2006
6 changed files with 50 additions and 33 deletions
@@ -604,18 +604,20 @@ namespace BLL
        /// <summary>
        /// 按材料编码获取防腐记录列表
        /// </summary>
-        public static List<Model.AntiCorrosionCheckRecordItem> GetAntiCorrosionChecksByMaterialCode(string materialCode, string projectId)
+        public static List<Model.AntiCorrosionCheckRecordItem> GetAntiCorrosionChecksByMaterialCode(string barCode, string projectId)
        {
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                var query = from r in db.HJGL_AntiCorrosionCheckRecord
                            join m in db.HJGL_MaterialCodeLib on r.MaterialCode equals m.MaterialCode into materialJoin
                            from m in materialJoin.DefaultIfEmpty()
+                            join code in db.Tw_InputDetailBarCode on m.MaterialCode equals code.MaterialCode into barCodeJoin
+                            from code in barCodeJoin.DefaultIfEmpty()
                            join paint in db.Tw_PaintCodeDict on r.PaintId equals paint.Id into paintJoin
                            from paint in paintJoin.DefaultIfEmpty()
                            join person in db.Person_Persons on r.CheckPerson equals person.PersonId into personJoin
                            from person in personJoin.DefaultIfEmpty()
-                            where r.MaterialCode == materialCode && (string.IsNullOrEmpty(projectId) || r.ProjectId == projectId)
+                            where code.BarCode == barCode && (string.IsNullOrEmpty(projectId) || r.ProjectId == projectId)
                            orderby r.CheckTime descending
                            select new Model.AntiCorrosionCheckRecordItem
                            {