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/BasicData/MesRohInManager.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 620f582..2e14366 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -18,7 +18,11 @@
var mesRohIn = GetMesRohIn(rohInErpRohIn);
var mesRohInDatas =
GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
- var erpLineDetailsDB = GetErpLineDetailsDB(rohIn.ErpLineDetails, rohInErpRohIn.Type);
+
+ var erpLineDetailsDB = GetErpLineDetailsDB(rohIn.ErpLineDetails, rohInErpRohIn.Type);
+
+
+
return UseTransaction(db =>
{
@@ -83,7 +87,7 @@
var ba1OrUpdate = db.Insertable(erpLineDetails).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
- if (erpLineDetails.Count==0)
+ if (erpLineDetails==null ||erpLineDetails.Count==0)
{
ba1OrUpdate = true;
}
@@ -106,7 +110,19 @@
var mesRohIn = new MesRohIn();
var single = base.GetSingle(it => it.EbelnK3id == eid);
- if (single != null) mesRohIn.Id = single.Id;
+ if (single != null)
+ {
+ mesRohIn.Id = single.Id;
+
+ if (single.CheckDate != null)
+ {
+ mesRohIn.CheckDate = single.CheckDate;
+ }
+ else
+ {
+ mesRohIn.CheckDate = DateTime.Now;
+ }
+ }
var mesLinkU9 = Db.Queryable<MesLinkU9>()
.Where(s => s.U9Id == rohIn.FSupplierId
@@ -244,6 +260,10 @@
private List<ErpLineDetailsDB> GetErpLineDetailsDB(
List<ErpLineDetails> erpLineDetails, string type)
{
+ if (erpLineDetails ==null)
+ {
+ return null;
+ }
return erpLineDetails.Select(s =>
{
var entity = new ErpLineDetailsDB
@@ -256,7 +276,8 @@
PlannedQty = s.PlannedQty,
SupplierConfirmsQty = s.SupplierConfirmsQty,
RequestDeliveryDate = s.RequestDeliveryDate,
- ActualArrivalQty = s.ActualArrivalQty
+ ActualArrivalQty = s.ActualArrivalQty,
+ FReceiveQty=s.FReceiveQty
};
--
Gitblit v1.9.3