From b599b5325388b5a9d3d60fa2979c442b092c5922 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 08 二月 2025 09:08:44 +0800
Subject: [PATCH] 1.生产领料优化 2.生产通用参数类，新增参数 3.来料检验显示调整，区分为已提交和未提交 4.来料检验，计算不良率 5.生产领料模块优化返回参数信息。
---
service/QC/LljService.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 63f536d..b4f51a4 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -26,11 +26,12 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
+ a => (a.STATUS ?? "") != "宸叉彁浜�")
+ //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => !((a.FcheckResu ?? "") == "" || (a.FcheckResu ?? "") == "妫�楠屼腑"))
+ a => (a.STATUS ?? "") == "宸叉彁浜�")
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
a => a.guid == parsedGuid)
.OrderByDescending(a => a.CreateDate)
@@ -313,6 +314,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