From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/service/QC/RKJService.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 1229e40..43f0696 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -522,10 +522,15 @@
.Where(a => a.Daa008 == a.Daa011 && a.Daa001== qsItemOqcReq.Daa001)
.Count();
- if (complete > 0)
+ var WqtQty = db.Queryable<Womdab>()
+ .Where(a => a.Dab001 == qsItemOqcReq.Daa001)
+ .Sum(a => a.Dab006- SqlFunc.IsNull(a.Dab007, 0));
+
+ if (complete > 0 && WqtQty == 0) //榻愬涓斿伐鍗曠敓浜ф暟閲�=宸ュ崟鏁伴噺锛屽伐鍗曟洿鏀逛负瀹屽伐
{
db.Updateable<Womdaa>()
.SetColumns(b => b.Daa018 == "瀹屽伐")
+ .SetColumns(b => b.Daa017 == DateTime.Now)
.Where(b => b.Daa001 == qsItemOqcReq.Daa001)
.ExecuteCommand();
}
@@ -981,6 +986,7 @@
//宸ュ崟鐘舵�佹洿鏀逛负寮�宸�
db.Updateable<Womdaa>()
.SetColumns(b => b.Daa018 == "寮�宸�")
+ .SetColumns(b => b.Daa017 == null)
.Where(b => b.Daa001 == oqcReqList.Daa001)
.ExecuteCommand();
}
--
Gitblit v1.9.3