wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source 
Conflicts:
	WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
This commit is contained in:
马健
2024-07-22 11:05:03 +08:00
parent 401d921f49 922a3bc391
commit c44c926c0c
15 changed files with 310 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -942,14 +942,19 @@ namespace Tnb.WarehouseMgr
if (input.area_code == "E")
await sign(input);
// 其它入库
if (input.wmsDistaskH.task_type == WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID)
{
Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它入库单到erp...");
}
// 其它出库
else
{
Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp...");
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id);
List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();
DictionaryDataEntity unitData = await _db.Queryable<DictionaryTypeEntity>()
@@ -1006,7 +1011,7 @@ namespace Tnb.WarehouseMgr
["crowno"] = wmsMaterialTransferd.lineno,
["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk,
["csourcebillhid"] = wmsMaterialTransfer.erp_pk,
["cunitid"] = erpExtendFields.Find(x => x.table_id == unitData.Id)?.cunitid ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == unitData?.Id)?.cunitid ?? "",
["cvendorid"] = "",
["cvendorvid"] = "",
["dbizdate"] = nowStr,
@@ -1030,6 +1035,7 @@ namespace Tnb.WarehouseMgr
thirdWebapiRecord.create_time = DateTime.Now;
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp成功");
}
}
catch(Exception ex)