From 2a0ac6f8783c138a3fa3937e0594ae339260f5e3 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 21 二月 2025 14:22:52 +0800
Subject: [PATCH] 1、Llj接口添加物料标识（FIRST）返回，0：非首次、1：首次
---
StandardPda/MES.Service/service/QC/LljService.cs | 13 +++++++------
StandardPda/MES.Service/Modes/LtsLlj.cs | 4 ++++
StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/LtsLlj.cs b/StandardPda/MES.Service/Modes/LtsLlj.cs
index e4de8ef..4e3d9d1 100644
--- a/StandardPda/MES.Service/Modes/LtsLlj.cs
+++ b/StandardPda/MES.Service/Modes/LtsLlj.cs
@@ -171,4 +171,8 @@
public int Ftype { get; set; }
[SugarColumn(IsIgnore = true)] public string? UserName { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏍囪瘑锛�0锛氶潪棣栨銆�1锛氶娆★級
+ /// </summary>
+ [SugarColumn(IsIgnore = true)] public int? FIRST { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs b/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
new file mode 100644
index 0000000..60daa28
--- /dev/null
+++ b/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
@@ -0,0 +1,40 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+
+ [SugarTable("V_MES_QA_ITEMS_DETECT_01")]
+ public class VMesQaItemsDetect01
+ {
+ /// <summary>
+ /// 瀵瑰簲瑙嗗浘涓殑 id 瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "id")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 瀵瑰簲瑙嗗浘涓殑 ITEM_ID 瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public string ItemId { get; set; }
+
+ /// <summary>
+ /// 瀵瑰簲瑙嗗浘涓殑 SUPP_NO 瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string SuppNo { get; set; }
+
+ /// <summary>
+ /// 瀵瑰簲瑙嗗浘涓殑 first 瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "first")]
+ public int First { get; set; }
+ }
+
+}
+
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 22a172b..d625b60 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -27,14 +27,14 @@
var itemIds = GetQaItem(db, queryObj.createUser);
- var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser>((a, b, c) =>
- new JoinQueryInfos(JoinType.Inner, a.ItemId == b.ItemId,
- JoinType.Inner, b.Sid == c.Fid
+ var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01>((a, b, c,d) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
+ JoinType.Left, b.Sid == c.Fid,JoinType.Inner, a.Id == d.Id
))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c) => a.FcheckResu == null)
+ (a, b, c) => a.FcheckResu == null )
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
@@ -44,9 +44,10 @@
(a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, c) => a.Id == id)
.OrderByDescending((a, b, c) => a.Id)
- .Select((a, b, c) => new LtsLlj
+ .Select((a, b, c, d) => new LtsLlj
{
- UserName = c.Fname
+ UserName = c.Fname,
+ FIRST=d.First
}, true)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
--
Gitblit v1.9.3