From f9ce79d464e7ba8dd09a7b37bc022ab442d3594f Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期三, 10 十二月 2025 16:16:44 +0800
Subject: [PATCH] 看板系统新代码提交
---
StandardPda/MES.Service/service/QC/BaseService.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/BaseService.cs b/StandardPda/MES.Service/service/QC/BaseService.cs
index a827168..5ae3697 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.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,51 @@
});
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;
+ }
+
+ 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 })
+ s.base64Date = Convert.ToBase64String(s.ImageData);
+ });
+ return mesQsImages;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3