From 06a580cf7d74ac5a0bfc05fc55ad5538d8ce6b2a Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期五, 06 九月 2024 14:49:30 +0800
Subject: [PATCH] AA
---
MES.Service/service/WomcaaManager.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 6b7e989..58569ec 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,
@@ -113,8 +113,14 @@
Caa016 = dto.FMemoItem,
Caa018 = Convert.ToDecimal(dto.planId),
Caa019 = Convert.ToDecimal(dto.planSeq),
- Caa020 = dto.planNum
+ Caa020 = dto.planNum,
+ FENTRYID = Convert.ToDecimal(dto.FENTRYID)
};
+
+ 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 +133,7 @@
{
Erpid = Convert.ToDecimal(dto.ID),
Cab001 = dto.FBillNo,
+ Cab002 = dto.FSeq,
Cab003 = dto.FMaterialID2,
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
? Convert.ToDecimal(dto.FNeedQty2)
@@ -149,9 +156,15 @@
Cab014 = dto.FIsKeyItem,
Numerator = dto.FNumerator,
Denominator = dto.FDenominator,
- Eid = Convert.ToDecimal(dto.PID)
+ Eid = Convert.ToDecimal(dto.PID),
+ SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
+ SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
};
+ 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