From 5adecb7ffd986930d2f4e195c0273e4db73b5315 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 07 二月 2025 18:36:51 +0800
Subject: [PATCH] 优化首检
---
MES.Service/service/QC/LljService.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/QC/LljService.cs b/MES.Service/service/QC/LljService.cs
index f9aa514..f3727d9 100644
--- a/MES.Service/service/QC/LljService.cs
+++ b/MES.Service/service/QC/LljService.cs
@@ -34,32 +34,32 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu == null)
+ a => a.FcheckResu == null && a.STATUS == "鏈彁浜�")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu != null)
+ a => a.FcheckResu != null && a.STATUS == "宸叉彁浜�")
.WhereIF(id > 0, a => a.Id == id)
.Where(a => depotCodes.Contains(a.DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
.OrderByDescending(a => a.Id)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
+
return (pageList, totalCount);
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemNo, decimal quantity, string releaseNo)
+ public List<MesQaItemsDetectDetail5> SetItems(string itemId, decimal quantity, string releaseNo)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
+ && s.ItemId == itemId && s.FTYPE == "1").Count();
if (count <= 0) return [];
var mesQaIqcItem = db
.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Select(
+ && s.ItemId == itemId && s.FTYPE == "1").Select(
b => new MesQaItemsDetectDetail5
{
ReleaseNo = releaseNo,
@@ -247,7 +247,7 @@
FreQty = a.FreQty,
Factory = "1000",
Company = "1000",
- FenterQty = SqlFunc.AggregateCount(b.Id),
+ FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
FcheckItemDesc = a.FcheckItemDesc
}).ToList();
--
Gitblit v1.9.3