From 567b9c89e3a8a7812a668909354f9fa634972278 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 06 三月 2025 13:22:36 +0800
Subject: [PATCH] 1.销售退货初步功能完成（后续新增防呆）
---
service/QC/LljService.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index e8154b2..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 => (a.STATUS ?? "") != "宸叉彁浜�")
+ //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => (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();
@@ -578,7 +580,7 @@
throw new Exception("璇ユ楠屽崟宸叉彁浜�");
if (mesQaItemsDetect01.FcheckDate == null)
- throw new Exception("璇ユ娴嬪崟鏈緭鍏ユ楠屾棩鏈燂紝璇锋牳瀵广��");
+ throw new Exception("璇ユ娴嬪崟娌℃湁妫�楠屽畬鎴愶紝璇锋牳瀵广��");
if (mesQaItemsDetect01.FcheckBy.IsNullOrEmpty())
throw new Exception("璇ユ娴嬪崟鏈緭鍏ユ楠屼汉鍛橈紝璇锋牳瀵广��");
--
Gitblit v1.9.3