From a619299816f2f632c7c6ba3a1bb869e2c212797d Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 19 十二月 2025 14:12:33 +0800
Subject: [PATCH] 对添加巡检单物料编码进行去重

---
 StandardPda/MES.Service/service/QC/BaseService.cs |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/StandardPda/MES.Service/service/QC/BaseService.cs b/StandardPda/MES.Service/service/QC/BaseService.cs
index 7e4abef..5ae3697 100644
--- a/StandardPda/MES.Service/service/QC/BaseService.cs
+++ b/StandardPda/MES.Service/service/QC/BaseService.cs
@@ -1,4 +1,4 @@
-锘縰sing MES.Service.DB;
+锘匡豢using MES.Service.DB;
 using MES.Service.Modes;
 using SqlSugar;
 
@@ -51,12 +51,46 @@
         });
         return mesQsImages;
     }
+
     public List<MesQsImage> getLljAllImgByFid(string id, string qsType)
     {
         var db = SqlSugarHelper.GetInstance();
-        var mesQsImages = db.Queryable<MesQsImage,MesQaItemsDetectDetail5>((a,b)=>
-        new JoinQueryInfos(JoinType.Left,a.Fid==b.Id))
-            .Where((a,b)=> b.ReleaseNo == id && a.Id != null).ToList();
+        var mesQsImages = db
+            .Queryable<MesQsImage, MesQaItemsDetectDetail5>((a, b) =>
+                new JoinQueryInfos(JoinType.Left, a.Fid == b.Id))
+            .Where((a, b) => b.ReleaseNo == id && a.Id != null).ToList();
+        mesQsImages.ForEach(s =>
+        {
+            if (s.ImageData is { Length: > 0 })
+                s.base64Date = Convert.ToBase64String(s.ImageData);
+        });
+        return mesQsImages;
+    }
+
+    public List<MesQsImage> getSjAllImgByFid(int id, string qsType)
+    {
+        var db = SqlSugarHelper.GetInstance();
+        var mesQsImages = db
+            .Queryable<MesQsImage, QsItemIpiItem>((a, b) =>
+                new JoinQueryInfos(JoinType.Left, a.Fid ==int.Parse( "777"+ b.Id.ToString())))
+            .Where((a, b) => b.Pid == id && a.Id != null).ToList();
+        mesQsImages.ForEach(s =>
+        {
+            if (s.ImageData is { Length: > 0 })
+                s.base64Date = Convert.ToBase64String(s.ImageData);
+        });
+        return mesQsImages;
+    }
+
+
+
+    public List<MesQsImage> getXjAllImgByFid(int id, string qsType)
+    {
+        var db = SqlSugarHelper.GetInstance();
+        var mesQsImages = db
+            .Queryable<MesQsImage, QsQaItemXj01>((a, b) =>
+                new JoinQueryInfos(JoinType.Left, a.Fid == int.Parse("666" + b.Id.ToString())))
+            .Where((a, b) => b.Pid == id && a.Id != null).ToList();
         mesQsImages.ForEach(s =>
         {
             if (s.ImageData is { Length: > 0 })

--
Gitblit v1.9.3