From d57d44bf22f7516500999a4935d8a589ae90e29c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 08:43:29 +0800
Subject: [PATCH] 1.委外订单主表入参新增fbillno 2.erp-》mes调拨单新增有无源单字段 3.生产订单优化
---
MES.Service/service/WomcaaManager.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index d7df90b..e9fc3f4 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,7 +23,8 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FBillNo);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -58,10 +59,11 @@
db.Deleteable<Womcab>()
.Where(s => s.Pid == mesWomcaa.Erpid).ExecuteCommand();
- //鎻掑叆蹇界暐绌哄瓧娈�
+ //鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
var orUpdate = db.Insertable(mesWomcaa)
.IgnoreColumns(true).ExecuteCommand() > 0;
+ //鎵归噺鎻掑叆蹇界暐绌哄瓧娈�
var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
@@ -83,12 +85,12 @@
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string PPBOMNO)
{
var entity = new Womcaa
{
Erpid = Convert.ToInt32(dto.Id), /// ERPID
- Caa001 = dto.FBillNo, /// 鍗曞彿
+ Caa001 = PPBOMNO, /// 鍗曞彿
Caa021 = dto.FWorkShopID, /// 宸ヤ綔杞﹂棿
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
@@ -99,7 +101,7 @@
Caa006 = dto.FMaterialId, /// 浜у搧缂栫爜
Caa009 = dto.FUnitId, /// 鍗曚綅
Caa012 = !string.IsNullOrEmpty(dto.FQty)
- ? Convert.ToInt32(dto.FQty)
+ ? Convert.ToDecimal(dto.FQty)
: null, /// 鏁伴噺
WorkGroupId = dto.FWorkGroupId, /// 璁″垝缁�
PlanId = dto.FPlannerID, /// 璁″垝鍛�
@@ -142,7 +144,9 @@
// PackingListNumber = dto.F_XIFG_Text_yrr, /// 鍖呰鍗曞彿
// CustomerName = dto.F_XIFG_Text_qtr1, /// 瀹㈡埛鍚嶇О
// Customer = dto.F_XIFG_Base_83g1, /// 瀹㈡埛
- Caa0111 = dto.FPlanFinishDate /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typea = dto.TypeA /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ //Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -159,12 +163,12 @@
{
var womcab = new Womcab
{
- Erpid = Convert.ToInt32(dto.FENTRYID), /// ERPID
+ Erpid = Convert.ToInt32(dto.Id), /// ERPID
Cab001 = dto.FBillNo, /// 宸ュ崟鍗曞彿
- Cab002 = dto.FSeq, /// 搴忓彿
+ Cab002 = Convert.ToInt32(dto.FSeq), /// 搴忓彿
Cab003 = dto.FMaterialID, /// 鏉愭枡缂栫爜
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
- ? Convert.ToInt32(dto.FNeedQty)
+ ? Convert.ToDecimal(dto.FNeedQty)
: null, /// 闇�棰嗙敤閲�
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
? Convert.ToInt32(dto.FPickedQty)
@@ -181,7 +185,7 @@
Cab009 = dto.FUnitID, /// 鍗曚綅
SupplyType = dto.FSupplyType, /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
- ? Convert.ToInt32(dto.FStdQty)
+ ? Convert.ToDecimal(dto.FStdQty)
: null, /// 缁勬垚鐢ㄩ噺
Cab014 = dto.FIsKeyItem, /// 鏄惁鏇挎枡
Numerator = dto.FNumerator, /// 鍒嗗瓙
@@ -191,10 +195,11 @@
Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
- Freplacegroup = dto.FReplaceGroup,
+ Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
- MustQty = Convert.ToDecimal(dto.FMustQty)
+ MustQty = Convert.ToDecimal(dto.FMustQty),
+ Typeb = dto.TypeB
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
@@ -206,7 +211,7 @@
};
var entity = Db.Queryable<Womcab>()
- .Where(s => s.Erpid == womcab.Erpid).Single();
+ .Where(s => s.Eid == womcab.Eid).Single();
if (entity != null) womcab.Guid = entity.Guid;
womcabList.Add(womcab);
--
Gitblit v1.9.3