From 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 12 六月 2025 20:42:41 +0800
Subject: [PATCH] 1,签收送货单接口,添加签收人;2.来料检接口,添加到货时间字段

---
 StandardPda/MES.Service/service/QC/BaseService.cs |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/StandardPda/MES.Service/service/QC/BaseService.cs b/StandardPda/MES.Service/service/QC/BaseService.cs
index a827168..ce466a0 100644
--- a/StandardPda/MES.Service/service/QC/BaseService.cs
+++ b/StandardPda/MES.Service/service/QC/BaseService.cs
@@ -1,18 +1,20 @@
 锘縰sing MES.Service.DB;
 using MES.Service.Modes;
+using SqlSugar;
 
 namespace MES.Service.service.QC;
 
 public class BaseService
 {
-    public string[]? getUserLineNo(string userNo)
+    public string?[] getUserLineNo(string userNo)
     {
         //MesLineUser
         var db = SqlSugarHelper.GetInstance();
         var mesLineUsers = db.Queryable<MesLineUser>()
             .Where(a => a.Fcode == userNo)
             .ToList();
-        return mesLineUsers.Select(s => s.LineNo).ToArray();
+        // 浣跨敤 Distinct 鏂规硶瀵� LineNo 杩涜鍘婚噸  
+        return mesLineUsers.Select(s => s.LineNo).Distinct().ToArray();
     }
 
     public int saveImage(List<MesQsImage> entity)
@@ -49,4 +51,19 @@
         });
         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();
+        mesQsImages.ForEach(s =>
+        {
+            if (s.ImageData is { Length: > 0 })
+                s.base64Date = Convert.ToBase64String(s.ImageData);
+        });
+        return mesQsImages;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3