From 82b020497a6e4570a61acf262712bacb757239f3 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 19 三月 2025 10:36:42 +0800
Subject: [PATCH] 1.来料检验查询优化
---
service/QC/LljService.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 63f536d..81d2ed3 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -23,16 +23,26 @@
var totalCount = 0;
var pageList = Db.Queryable<LLJView>()
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- a => !((a.FcheckResu ?? "") == "" || (a.FcheckResu ?? "") == "妫�楠屼腑"))
+ //.WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // "鏈畬鎴�".Equals(queryObj.result),
+ // a => (a.STATUS ?? "") != "宸叉彁浜�")
+ // //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
+ //.WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // !"鏈畬鎴�".Equals(queryObj.result),
+ // a => (a.STATUS ?? "") == "宸叉彁浜�")
+
+ .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
+ a.ItemNo.Contains(queryObj.keyword) ||
+ a.ItemName.Contains(queryObj.keyword) ||
+ a.LotNo.Contains(queryObj.keyword) ||
+ a.ReleaseNo.Contains(queryObj.keyword) ||
+ a.SuppName.Contains(queryObj.keyword)
+ )
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.guid == parsedGuid)
+ a => a.guid == parsedGuid )
+ .Where(a => (a.fsubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -313,6 +323,7 @@
commit += db.Updateable<MesQaItemsDetectDetail5>()
.SetColumns(s => s.FcheckResu == result)
.SetColumns(s => s.FenterQty == count)
+ .SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
.Where(s => s.Guid == detail.ParentGuid)
.ExecuteCommand();
--
Gitblit v1.9.3