From 54c83d07d8317692b73f3af84d8df504812c3275 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 23 四月 2025 17:57:04 +0800
Subject: [PATCH] 巡检检验项目查询新增工序条件
---
MESApplication/Controllers/QC/XJController.cs | 3 ++-
MES.Service/service/QC/XJService.cs | 11 +++++++++--
2 files changed, 11 insertions(+), 3 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>();
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
index ef25d6b..525bb08 100644
--- a/MESApplication/Controllers/QC/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -165,11 +165,12 @@
public ResponseResult setJYItem([FromBody] JObject data)
{
var itemNo = data["itemNo"].ToString();
+ var lineNo = data["lineNo"]?.ToString();
try
{
dynamic resultInfos = new ExpandoObject();
var tbBillList =
- new XJService().setJYItem(itemNo);
+ new XJService().setJYItem(itemNo, lineNo);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
--
Gitblit v1.9.3