From 4430f49d7a5ce2303633cbeac7ec0c9be05572d1 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期六, 17 八月 2024 11:24:07 +0800
Subject: [PATCH] 关联条件 物料编号改为物料id
---
MES.Service/service/WomcaaManager.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 6b7e989..8e52cfb 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -34,6 +34,7 @@
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
case "2":
case "4":
+ case "5":
return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
? 1
: 0;
@@ -74,13 +75,11 @@
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
{
- return new Womcaa
+ var entity = new Womcaa
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
- Caa021 = dto.FWorkShopID0,
- RoutingId = dto.FRoutingId,
- WorkShopId = dto.FREMWorkShopId,
+ Caa021 = dto.FWorkShopID,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
Caa004 = dto.FBillType,
@@ -100,7 +99,6 @@
Mtono = dto.FMTONO,
Lot = dto.FLot,
Caa013 = dto.FBomId,
- Caa015 = dto.F_UNW_Text_xsddh,
CreateType = dto.FCreateType,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
@@ -110,11 +108,16 @@
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
- Caa016 = dto.FMemoItem,
+ Caa016 = dto.FDESCRIPTION,
Caa018 = Convert.ToDecimal(dto.planId),
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)
@@ -125,11 +128,12 @@
{
var womcab = new Womcab
{
- Erpid = Convert.ToDecimal(dto.ID),
+ Erpid = Convert.ToDecimal(dto.FENTRYID),
Cab001 = dto.FBillNo,
- Cab003 = dto.FMaterialID2,
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
- ? Convert.ToDecimal(dto.FNeedQty2)
+ Cab002 = dto.FSeq,
+ Cab003 = dto.FMaterialID,
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
+ ? Convert.ToDecimal(dto.FNeedQty)
: null,
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
? Convert.ToDecimal(dto.FPickedQty)
@@ -149,9 +153,13 @@
Cab014 = dto.FIsKeyItem,
Numerator = dto.FNumerator,
Denominator = dto.FDenominator,
- Eid = Convert.ToDecimal(dto.PID)
+ Eid = Convert.ToDecimal(dto.FID)
};
+ 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