From a619299816f2f632c7c6ba3a1bb869e2c212797d Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 19 十二月 2025 14:12:33 +0800
Subject: [PATCH] 对添加巡检单物料编码进行去重
---
StandardPda/MES.Service/service/QC/RKJService.cs | 132 ++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 72 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/RKJService.cs b/StandardPda/MES.Service/service/QC/RKJService.cs
index 6ad9bb9..5cb1599 100644
--- a/StandardPda/MES.Service/service/QC/RKJService.cs
+++ b/StandardPda/MES.Service/service/QC/RKJService.cs
@@ -76,29 +76,28 @@
var qsItemOqcItems = db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "3"
- && b.ItemNo == itemNo).Select(
- b => new QsItemOqcItem
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- Result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
+ && b.ItemNo == itemNo).Select(b => new QsItemOqcItem
+ {
+ ProjName = b.ProjName,
+ ItemMod = b.ItemMod,
+ InspectionMethod = b.InspectionMethod,
+ UsingInstruments = b.UsingInstruments,
+ LevelNum = SqlFunc.IsNull(
+ SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
+ b.InspectionLevel),
+ MaxValue = b.MaxValue,
+ StandardValue = b.StandardValue,
+ MinValue = b.MinValue,
+ Notes = b.Notes,
+ FcheckLevel = b.FcheckLevel,
+ FacLevel = b.FacLevel,
+ QsCode = b.QsCode,
+ QsName = b.QsName,
+ Result = "鏈娴�",
+ isCheck = 0,
+ Picture = b.Picture,
+ Picturename = b.Picturename
+ }).ToList();
qsItemOqcItems.ForEach(item =>
{
@@ -319,15 +318,10 @@
.Where(o => o.Id == detail.Gid)
.First();
- if (qsItemOqcReq == null)
- {
- throw new Exception("璇ユ楠屽崟涓嶅瓨鍦紝璇峰洖鍒板叆搴撴鍒楄〃閲嶆柊鏌ョ湅");
- }
+ if (qsItemOqcReq == null) throw new Exception("璇ユ楠屽崟涓嶅瓨鍦紝璇峰洖鍒板叆搴撴鍒楄〃閲嶆柊鏌ョ湅");
if (!string.IsNullOrEmpty(qsItemOqcReq.FcheckResu))
- {
throw new Exception("璇ユ楠屽崟宸�" + qsItemOqcReq.FcheckResu + "锛屼笉杩愯淇敼缁撴灉");
- }
var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
{
@@ -382,8 +376,8 @@
result = 1;
else if (count - passCount < QsItemOqcItem.FreQty) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemOqcItem>()
@@ -439,33 +433,32 @@
}
/// <summary>
- /// 褰撴楠屽崟涓嶅悎鏍兼椂锛�
- /// 鍙栨秷mes_inv_item_barcodes 鐨勬姤宸ユ爣璇� WORK_FLG
- /// womdaa 宸茬敓浜ч噺 DAA011鍔犲洖鏉＄爜鎶ュ伐鏁伴噺
- /// MES_SCGD_GX 妫�楠屾爣璇� CHECK_FLAG锛�('鈭�','脳')
- /// 閫氳繃mes_inv_item_in_c_details2鐨凪ES_SCGD_GX_ID杩炴帴
- ///</summary>
+ /// 褰撴楠屽崟涓嶅悎鏍兼椂锛�
+ /// 鍙栨秷mes_inv_item_barcodes 鐨勬姤宸ユ爣璇� WORK_FLG
+ /// womdaa 宸茬敓浜ч噺 DAA011鍔犲洖鏉＄爜鎶ュ伐鏁伴噺
+ /// MES_SCGD_GX 妫�楠屾爣璇� CHECK_FLAG锛�('鈭�','脳')
+ /// 閫氳繃mes_inv_item_in_c_details2鐨凪ES_SCGD_GX_ID杩炴帴
+ /// </summary>
private void setBarCodes(string? FcheckResu, QsItemOqcItemDetail detail,
SqlSugarClient db)
{
- var oqcReqList = db.Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>(
- (a, b, c) =>
- new JoinQueryInfos(
- JoinType.Left, a.BillNo == b.BillNo,
- JoinType.Left, c.Daa001 == b.RbillNo
- ))
+ var oqcReqList = db
+ .Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>((a, b, c) =>
+ new JoinQueryInfos(
+ JoinType.Left, a.BillNo == b.BillNo,
+ JoinType.Left, c.Daa001 == b.RbillNo
+ ))
.Where(a => a.Id == detail.Gid)
.Select((a, b, c) =>
new
{
- a.Id, a.BillNo, c.Daa001
+ a.Id,
+ a.BillNo,
+ c.Daa001
})
.ToList();
- if (oqcReqList.Count <= 0)
- {
- return;
- }
+ if (oqcReqList.Count <= 0) return;
var qsItemOqcReq = oqcReqList.First(); // 鑾峰彇绗竴涓厓绱�
@@ -499,7 +492,7 @@
.ExecuteCommand();
if (count <= 0) return;
-
+
//鍙栨秷mes_inv_item_barcodes 鐨勬姤宸ユ爣璇� WORK_FLG 浣跨敤鏉＄爜
var executeCommand = db.Updateable<MesInvItemBarcodes>()
.SetColumns(a => a.WorkFlg == 1)
@@ -507,13 +500,11 @@
.ExecuteCommand();
if (executeCommand > 0)
- {
//womdaa 宸茬敓浜ч噺 DAA011鍔犲洖鏉＄爜鎶ュ伐鏁伴噺
db.Updateable<Womdaa>()
.SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
.Where(b => b.Daa001 == qsItemOqcReq.Daa001)
.ExecuteCommand();
- }
}
else if ("涓嶅悎鏍�".Equals(FcheckResu))
{
@@ -530,13 +521,11 @@
.ExecuteCommand();
if (executeCommand > 0)
- {
//womdaa 宸茬敓浜ч噺 DAA011鍔犲洖鏉＄爜鎶ュ伐鏁伴噺
db.Updateable<Womdaa>()
.SetColumns(b => b.Daa011 == b.Daa011 - sumQty)
.Where(b => b.Daa001 == qsItemOqcReq.Daa001)
.ExecuteCommand();
- }
}
}
@@ -599,8 +588,8 @@
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
- RKJDaa001, Womdaa, VLineUser>(
- (a, b, c, ca, m, da, z) => new JoinQueryInfos(
+ RKJDaa001, Womdaa, VLineUser>((a, b, c, ca, m, da, z) =>
+ new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo,
JoinType.Left, a.BillNo == c.BillNo,
JoinType.Left,
@@ -609,7 +598,7 @@
c.Factory == ca.Factory,
JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
JoinType.Left, da.Daa001 == c.RbillNo,
- JoinType.Left, da.Daa015 == z.LineNo//,
+ JoinType.Left, da.Daa015 == z.LineNo //,
//JoinType.Left,c.Bgr == d.UserNo
))
// .WhereIF(lineNo != null && lineNo.Length > 0,
@@ -629,8 +618,11 @@
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
- (a, b, c, ca, m, da, z) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
- || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ (a, b, c, ca, m, da, z) =>
+ b.ItemName.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower()
+ .Contains(queryObj.SearchValue.ToLower()))
.Select((a, b, c, ca, m, da, z) => new QsItemOqcReq
{
BillNo = a.BillNo,
@@ -650,7 +642,7 @@
ItemInId = m.ItemInId,
Daa015 = da.Daa015,
LineNo = c.LineNo,
- Quantity = m.Quantity,
+ Quantity = m.Quantity
//Bgr = d.UserName
})
.OrderBy(a => a.CreateDate, OrderByType.Desc)
@@ -727,15 +719,10 @@
.Where(o => o.Id == detail.Gid)
.First();
- if (qsItemOqcReq == null)
- {
- throw new Exception("璇ユ楠屽崟涓嶅瓨鍦紝璇峰洖鍒板叆搴撴鍒楄〃閲嶆柊鏌ョ湅");
- }
+ if (qsItemOqcReq == null) throw new Exception("璇ユ楠屽崟涓嶅瓨鍦紝璇峰洖鍒板叆搴撴鍒楄〃閲嶆柊鏌ョ湅");
if (!string.IsNullOrEmpty(qsItemOqcReq.FcheckResu))
- {
throw new Exception("璇ユ楠屽崟宸�" + qsItemOqcReq.FcheckResu + "锛屼笉杩愯淇敼缁撴灉");
- }
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
{
@@ -852,13 +839,14 @@
private bool isRk(int? gid)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,MesInvItemStocks>(
- (a, b, c,d) => new JoinQueryInfos(
- JoinType.Inner, a.BillNo == b.BillNo,
- JoinType.Inner, b.Id == c.ItemInId,
- JoinType.Inner,c.ItemBarcode == d.ItemBarcode
- ))
- .Where((a, b, c,d) => a.Id == gid)
+ return db
+ .Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,
+ MesInvItemStocks>((a, b, c, d) => new JoinQueryInfos(
+ JoinType.Inner, a.BillNo == b.BillNo,
+ JoinType.Inner, b.Id == c.ItemInId,
+ JoinType.Inner, c.ItemBarcode == d.ItemBarcode
+ ))
+ .Where((a, b, c, d) => a.Id == gid)
.Count() > 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3