From 9f1c20b47db5ca023ab864def323e99fe1267f08 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 20 二月 2025 14:49:09 +0800
Subject: [PATCH] 1.期初入库新增库存组织。 2.委外领料完成 3.委外补料正常领料完成，拆分还未测试.
---
service/QC/LljService.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index a38eb54..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)
@@ -253,6 +254,7 @@
var item = new MesQaItemsDetectDetail12();
item.ParentGuid = detail.ParentGuid;
item.GrandpaGuid = detail.GrandpaGuid;
+ item.FcheckItem = detail.FcheckItem;
item.Fstand = detail.Fstand;
item.FcheckResu = detail.FcheckResu;
item.CreateBy = detail.LastupdateBy;
@@ -260,7 +262,7 @@
result.Add(item);
}
- return db.Insertable(result).IgnoreColumns(true).ExecuteCommand();
+ return db.Insertable(result).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
});
detail.CreateBy = detail.LastupdateBy;
@@ -312,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();
@@ -451,9 +454,7 @@
if (qsItemOqcItem.FupAllow.IsNullOrEmpty()
&& qsItemOqcItem.FdownAllow.IsNullOrEmpty()
&& qsItemOqcItem.Fstand == null)
- {
mesQaItemsDetectDetail12.isNumber = false;
- }
}
return rkjDto;
@@ -579,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