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/WomcaaManager.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 3f38115..29f7dd7 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -57,7 +57,30 @@
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
- if (orUpdate && baOrUpdate) return true;
+
+ if (orUpdate && baOrUpdate)
+ {
+ //瀹氫箟杈撳叆鍙傛暟
+ var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outParam1 = new SugarParameter("c_Result", null, true);
+ var outParam2 = new SugarParameter("C_MSG", null, true);
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ int result = int.Parse((string)outParam1.Value);
+ string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ if (result == 1)
+ {
+ //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
+ //db.Ado.RollbackTran();
+ throw new Exception(message);
+ }
+ // 鎻愪氦浜嬪姟
+ //db.Ado.CommitTran();
+ return true;
+ }
+
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -102,13 +125,7 @@
Caa013 = dto.FBomId,
CreateType = dto.FCreateType,
- Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
- ? Convert.ToInt64(dto.PLAN_ID)
- : null,
- Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
- ? Convert.ToInt64(dto.PLAN_SEQ)
- : null,
- Caa020 = dto.PLAN_NUM,
+ Caa020 = dto.FBillNo,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
SrcBillentryseq = dto.FSrcBillEntrySeq,
@@ -118,7 +135,6 @@
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
Caa016 = dto.FDescription,
- //BTBZ = dto.BTBZ,
PrdOrg = dto.FPrdOrgId,
TrustOrg = dto.FEnTrustOrgId,
Bomtype = dto.FBOMType,
@@ -140,8 +156,11 @@
Totalrcvqty = dto.FTotalRcvQty,
Totalreworkingqty = dto.FTotalReworkingQty,
Reasonforrework = dto.FReasonForRework,
- Isforcewholeset = dto.FIsForceWholeSet,
- Typea = dto.TypeA
+ Isforcewholeset = dto.FIsForceWholeSet,
+ PREVMO = dto.FPrevMO,
+ TsDate = DateTime.Now,
+ Typea = dto.TypeA,
+ ISCANCEL = dto.FIsCancel
};
@@ -154,7 +173,13 @@
&& x.OrgId == dto.FPrdOrgId
&& x.TableType == "MES_ITEMS").First();
+ var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+ && x.OrgId == dto.FPrdOrgId
+ && x.TableType == "MES_PROJECT").First();
+
if (mesLinkU9 != null) entity.Caa006 = mesLinkU9.MesId;
+ if (mesLinkU9_xm != null) entity.Project = Convert.ToInt64(mesLinkU9_xm.MesId);
return entity;
}
@@ -253,7 +278,19 @@
&& x.OrgId == "1002011210000095"
&& x.TableType == "MES_ITEMS").First();
+ var mesLinkU9_TDL = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FSubstitutedItem)
+ && x.OrgId == "1002011210000095"
+ && x.TableType == "MES_ITEMS").First();
+
+ var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+ && x.OrgId == "1002011210000095"
+ && x.TableType == "MES_PROJECT").First();
+
if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId;
+ if (mesLinkU9_TDL != null) womcab.Substituteditem = Convert.ToInt64(mesLinkU9_TDL.MesId);
+ if (mesLinkU9_xm != null) womcab.Project = mesLinkU9_xm.MesId;
womcabList.Add(womcab);
}
--
Gitblit v1.9.3