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/Modes/MesQsImage.cs | 3 +
MES.Service/service/QC/BaseService.cs | 36 +++++++++++++++++
MESApplication/Controllers/QC/BaseController.cs | 25 ++++++++++++
3 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/MES.Service/Modes/MesQsImage.cs b/MES.Service/Modes/MesQsImage.cs
index 59f1546..641114e 100644
--- a/MES.Service/Modes/MesQsImage.cs
+++ b/MES.Service/Modes/MesQsImage.cs
@@ -42,6 +42,9 @@
[SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
[StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
public string? QsType { get; set; }
+
+ [SugarColumn(ColumnName = "ORDER_NO")] //鐢ㄤ簬SqlSugar
+ public string? OrderNo { get; set; }
/// <summary>
/// 鍥剧墖鍚嶇О
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
diff --git a/MESApplication/Controllers/QC/BaseController.cs b/MESApplication/Controllers/QC/BaseController.cs
index 5b35c14..d2d4618 100644
--- a/MESApplication/Controllers/QC/BaseController.cs
+++ b/MESApplication/Controllers/QC/BaseController.cs
@@ -82,6 +82,31 @@
}
}
+ //getByOqcFid
+ [HttpPost("getByOqcFid")]
+ public ResponseResult getByOqcFid([FromBody] JObject data)
+ {
+ var id = Convert.ToInt32(data["fid"].ToString());
+ var qsType = data["qsType"].ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new BaseService().getByOqcFid(id, qsType);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鑾峰彇鏉ユ枡妫�鍗曚釜妫�楠屽崟涓婁紶鐨勬墍鏈夊浘鐗�
/// </summary>
--
Gitblit v1.9.3