From 1afd9dafa4d1ec83f4f94c2ceae41b03179b533f Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 11 十二月 2024 09:54:10 +0800
Subject: [PATCH] Revert "销售退货通知单完善、销售收货通知单增加"
---
MES.Service/service/WomcaaManager.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 3e98070..e9cb774 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -4,6 +4,7 @@
using SqlSugar;
namespace MES.Service.service;
+using DbType = System.Data.DbType;
public class WomcaaManager : Repository<Womcaa>
{
@@ -55,8 +56,18 @@
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
+
+ var inputParam = mesWomcaa.Erpid;
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA(:P_ID); END;",
+ new SugarParameter("P_ID", inputParam,
+ DbType.Decimal));
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+
}
private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
@@ -74,12 +85,13 @@
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
{
- return new Womcaa
+ var entity = new Womcaa
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
- WorkShopId = dto.FWorkShopID0,
+ Caa021 = dto.FWorkShopID0,
RoutingId = dto.FRoutingId,
+ WorkShopId = dto.FREMWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
Caa004 = dto.FBillType,
@@ -112,8 +124,14 @@
Caa016 = dto.FMemoItem,
Caa018 = Convert.ToDecimal(dto.planId),
Caa019 = Convert.ToDecimal(dto.planSeq),
- Caa020 = dto.planNum
+ Caa020 = dto.planNum,
+ FMOENTRYID = Convert.ToDecimal(dto.FMOENTRYID)
};
+
+ 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)
@@ -126,6 +144,7 @@
{
Erpid = Convert.ToDecimal(dto.ID),
Cab001 = dto.FBillNo,
+ Cab002 = dto.FSeq,
Cab003 = dto.FMaterialID2,
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
? Convert.ToDecimal(dto.FNeedQty2)
@@ -148,9 +167,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