From 105639743f1b2f8c47a5bc9659532f231935206b Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 15 八月 2024 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/WomcaaManager.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 6b7e989..f6f8b8d 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -74,7 +74,7 @@
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
{
- return new Womcaa
+ var entity = new Womcaa
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
@@ -115,6 +115,11 @@
Caa019 = Convert.ToDecimal(dto.planSeq),
Caa020 = dto.planNum
};
+
+ var single = base.GetSingle(it => it.Erpid == entity.Erpid);
+ if (single != null) entity.Id = single.Id;
+
+ return entity;
}
private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList)
@@ -127,6 +132,7 @@
{
Erpid = Convert.ToDecimal(dto.ID),
Cab001 = dto.FBillNo,
+ Cab002 = dto.FSeq,
Cab003 = dto.FMaterialID2,
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
? Convert.ToDecimal(dto.FNeedQty2)
@@ -152,6 +158,10 @@
Eid = Convert.ToDecimal(dto.PID)
};
+ var entity = Db.Queryable<Womcab>()
+ .Where(s => s.Erpid == womcab.Erpid).Single();
+ if (entity != null) womcab.Id = entity.Id;
+
womcabList.Add(womcab);
}
--
Gitblit v1.9.3