From 91489875fc8c9fd2b44c3791ca6f67dcf559675f Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 18 六月 2025 18:52:56 +0800
Subject: [PATCH] 修改入库检更新工单完工条件
---
MES.Service/service/QC/RKJService.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 3c53e13..43f0696 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -513,9 +513,27 @@
{
//womdaa 宸茬敓浜ч噺 DAA011鍔犱笂鏉＄爜鎶ュ伐鏁伴噺
db.Updateable<Womdaa>()
- .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
+ .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) + sumQty)
.Where(b => b.Daa001 == qsItemOqcReq.Daa001)
.ExecuteCommand();
+
+ //鍒ゆ柇鏄惁瀹屽伐
+ var complete = db.Queryable<Womdaa>()
+ .Where(a => a.Daa008 == a.Daa011 && a.Daa001== qsItemOqcReq.Daa001)
+ .Count();
+
+ 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();
+ }
}
}
else if ("涓嶅悎鏍�".Equals(FcheckResu))
@@ -812,7 +830,7 @@
});
}
- public int saveItem(RKJDto rkjDto)
+ public int saveItem(RKJDto rkjDto) //鑷姩鐢熸垚鍚堟牸鐨勬楠岄」
{
var items = rkjDto.items;
var userNo = rkjDto.userNo;
@@ -869,18 +887,32 @@
.Select((a, b) => new {b.Quantity })
.MergeTable().Sum( a=> a.Quantity);
+ /*
//鏇存柊鐢熶骇閲�
db.Updateable<Womdaa>()
- .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
+ .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) + sumQty)
.Where(b => b.Daa001 == oqcReqList.Daa001)
.ExecuteCommand();
+ //鍒ゆ柇鏄惁瀹屽伐
+ var complete = db.Queryable<Womdaa>()
+ .Where(a => a.Daa008 == a.Daa011 && a.Daa001 == oqcReqList.Daa001)
+ .Count();
+ if (complete > 0)
+ {
+ db.Updateable<Womdaa>()
+ .SetColumns(b => b.Daa018 == "瀹屽伐")
+ .Where(b => b.Daa001 == oqcReqList.Daa001)
+ .ExecuteCommand();
+ }
+
+ */
return Convert.ToInt32(rkjDto.gid);
}
- public int cleanReqResult(RKJDto dto)
+ public int cleanReqResult(RKJDto dto) //娓呴櫎妫�楠岀粨鏋�
{
if (isRk(dto.gid)) throw new Exception("宸叉湁鏉＄爜鍏ュ簱锛屼笉鍏佽娓呴櫎妫�楠岀粨鏋�");
@@ -947,7 +979,14 @@
{
//womdaa 宸茬敓浜ч噺 DAA011鎵ｉ櫎鏉＄爜鎶ュ伐鏁伴噺
db.Updateable<Womdaa>()
- .SetColumns(b => b.Daa011 == b.Daa011 - sumQty)
+ .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) - sumQty)
+ .Where(b => b.Daa001 == oqcReqList.Daa001)
+ .ExecuteCommand();
+
+ //宸ュ崟鐘舵�佹洿鏀逛负寮�宸�
+ db.Updateable<Womdaa>()
+ .SetColumns(b => b.Daa018 == "寮�宸�")
+ .SetColumns(b => b.Daa017 == null)
.Where(b => b.Daa001 == oqcReqList.Daa001)
.ExecuteCommand();
}
--
Gitblit v1.9.3