From ed0b898d7f0c05516e83133c8bc5b45e14876a28 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 17 二月 2025 14:43:52 +0800
Subject: [PATCH] 1.采购订单时间调整 2.采购订单接口新增route
---
MES.Service/service/WomcaaManager.cs | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index a39614e..e88f9fb 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -58,8 +58,15 @@
db.Deleteable<Womcab>()
.Where(s => s.Pid == mesWomcaa.Erpid).ExecuteCommand();
- var orUpdate = base.Insert(mesWomcaa);
- var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
+ //鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
+ var orUpdate = db.Insertable(mesWomcaa)
+ .IgnoreColumns(true).ExecuteCommand() > 0;
+
+ //鎵归噺鎻掑叆蹇界暐绌哄瓧娈�
+ var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
+ .IgnoreColumnsNull()
+ .ExecuteCommand() > 0;
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -93,7 +100,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, /// 璁″垝鍛�
@@ -127,6 +134,7 @@
//Caa015 = dto.F_UNW_Text_xsddh, /// 閿�鍞鍗曞彿
ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// 鐢熶骇缁勭粐ID
ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), /// 濮旀墭缁勭粐ID
+ Btbz = dto.Btbz, /// 濮旀墭缁勭粐ID
//Caa015Head = dto.F_XIFG_Integer_tzk, /// 閿�鍞鍗曡鍙�
//MainProductNo = dto.F_XIFG_Base_w5c, /// 涓讳骇鍝佺紪鐮�
// MainProductQty =
@@ -135,7 +143,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);
@@ -152,12 +162,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)
@@ -174,7 +184,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, /// 鍒嗗瓙
@@ -183,7 +193,12 @@
Eid = Convert.ToInt32(dto.Id), /// ERP ID
Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
- Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
+ Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
+ Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
+ UseRate = Convert.ToDecimal(dto.FUseRate),
+ MaterialType = dto.FMaterialType,
+ MustQty = Convert.ToDecimal(dto.FMustQty),
+ Typeb = dto.TypeB
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
@@ -195,7 +210,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