From 2812f65c7481ce10953fa1fbe9cc89a8768e07f6 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 23 四月 2025 17:13:55 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/QC/XJService.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index e4b32e3..6099c17 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -166,12 +166,19 @@
}
- public List<QsQaItemXj01> setJYItem(string itemNo)
+ public List<QsQaItemXj01> setJYItem(string itemNo, string lineNo)
{
var db = SqlSugarHelper.GetInstance();
+ //鏍规嵁绾夸綋缂栧彿鑾峰彇宸ュ簭ID
+
+
+ decimal? procid = db.Queryable<MesLine>().Where(s => s.LineNo == lineNo).Select(s => s.ProcId).First();
+
+ if (procid == null) { procid = 99999999; };
+
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemNo == itemNo && s.Fsubmit == 1 && s.procid == procid).Count();
if (count <= 0) return new List<QsQaItemXj01>();
--
Gitblit v1.9.3