From 3296c70dfc999ff1d09ac28d6205197c11825c5f Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 22 五月 2025 14:58:26 +0800
Subject: [PATCH] 1，来料检添加‘往期检验履历’，‘最大抽检数量’两个字段 2，一致性核对添加图片是否上传校验
---
StandardPda/MESApplication/Controllers/QC/LljController.cs | 10 ++++++----
StandardPda/MES.Service/service/QC/LljService.cs | 29 +++++++++++++++++++++++++++++
StandardPda/MES.Service/Modes/LtsLlj.cs | 10 ++++++++++
3 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/LtsLlj.cs b/StandardPda/MES.Service/Modes/LtsLlj.cs
index 6569424..3616a98 100644
--- a/StandardPda/MES.Service/Modes/LtsLlj.cs
+++ b/StandardPda/MES.Service/Modes/LtsLlj.cs
@@ -181,6 +181,16 @@
/// </summary>
[SugarColumn(ColumnName = "EXTEND_N01")]
public string? ExtendNo1 { get; set; }
+ /// <summary>
+ /// 寰�鏈熸楠屽饱鍘�
+ /// </summary>
+ [SugarColumn(ColumnName = "LVLI")]
+ public string? LVLI { get; set; }
+ /// <summary>
+ /// 鏈�澶ф娊妫�鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QYT")]
+ public string? MaxCheckQyt { get; set; }
[SugarColumn(IsIgnore = true)] public string? UserName { get; set; }
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 888e9b9..0ef3a9a 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -800,6 +800,35 @@
SQLHelper.ExecuteQuery(sql2);
}
+
+ public string[] YzxImgVerify(string id)
+ {
+ string[] msgStr = new string[2];
+
+ OracleSQLHelper SQLHelper = new();
+ //淇敼缁撴灉
+ var sql2 = string.Format(@"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='"+ id + "' group by ITEMNAME) A " +
+ "left join MES_QS_IMAGE b on a.id=b.fid where B.id is null order by ITEMNAME");
+ DataTable db= SQLHelper.ExecuteQuery(sql2);
+ if (db.Rows.Count > 0)
+ {
+ msgStr[1] = "鍏冨櫒浠讹細";
+ for (int i = 0; i < db.Rows.Count; i++)
+ {
+ msgStr[1] += db.Rows[i]["ITEMNAME"]+ ",";
+ }
+ msgStr[1] += "鏈畬鎴愬浘鐗囦笂浼狅紝璇蜂笂浼狅紒";
+ msgStr[0] = "1";
+ }
+ else
+ {
+ msgStr[0] = "0";
+ msgStr[1] = "ok";
+ }
+
+ return msgStr;
+ }
+
public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail)
{
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index 21faab8..3952b61 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.Dto.service;
+锘縰sing Masuit.Tools;
+using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
@@ -212,12 +213,13 @@
try
{
new LljService().saveYzxBDlist(id, dt);
+ string[] msg=new LljService().YzxImgVerify(id);
return new ResponseResult
{
- status = 0,
- message = "OK",
- data = "ok"
+ status = int.Parse( msg[0]),
+ message = msg[1],
+ data = ""
};
}
catch (Exception ex)
--
Gitblit v1.9.3