From 93473e2792e5d23a168e575f17190a5e51ad7c9f Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 17 七月 2025 09:55:58 +0800
Subject: [PATCH] 111
---
MES.Service/service/QC/BaseService.cs | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/MES.Service/service/QC/BaseService.cs b/MES.Service/service/QC/BaseService.cs
index 11a21c6..a1e2489 100644
--- a/MES.Service/service/QC/BaseService.cs
+++ b/MES.Service/service/QC/BaseService.cs
@@ -55,7 +55,7 @@
{
var db = SqlSugarHelper.GetInstance();
var mesQsImages = db
- .Queryable<MesQsImage, MesOqcItemsDetectDetail5>((a, b) =>
+ .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 =>
@@ -65,4 +65,38 @@
});
return mesQsImages;
}
+
+ public List<MesQsImage> getByOqcFid(decimal id, string qsType)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ var mesQsImages = db.Queryable<MesQsImage>()
+ .Where(s => s.Fid == id && s.QsType == qsType).ToList();
+
+ var mesOqcItemsDetect02 = db.Queryable<MesOqcItemsDetect02>()
+ .Where(s=>s.Id == id).First();
+
+ if (mesOqcItemsDetect02?.SaleOrderNo != null)
+ {
+ var baseOrderNo = mesOqcItemsDetect02.SaleOrderNo.Split('-')[0];
+
+ var additionalImages = db.Queryable<MesQsImage>()
+ .Where(s => s.OrderNo == baseOrderNo && s.QsType == qsType)
+ .Where(s => !mesQsImages.Any(existing => existing.Id == s.Id))
+ .ToList();
+
+ mesQsImages.AddRange(additionalImages);
+
+ if (mesQsImages.Count > 9)
+ {
+ mesQsImages = mesQsImages.Take(9).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