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
This commit is contained in:
马健
2024-10-16 10:26:29 +08:00
parent 68f270c47b 1b65d45580
commit 21fb6ef381
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs
View File

@@ -283,6 +283,8 @@ namespace Tnb.WarehouseMgr
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && (unitCodes.Contains(y.EnCode) || unitCodes.Contains(y.Id)))
.Select((x, y) => y)
.ToListAsync();
DictionaryDataEntity tranData = await _db.Queryable<DictionaryDataEntity>().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsOutsourceH.vtrantypecode).FirstAsync();
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x => x.id != null).ToListAsync();
WmsOutsourceOrderH wmsOutsourceOrderH = await _db.Queryable<WmsOutsourceOrderH>().SingleAsync(x => x.id == wmsOutsourceH.erp_bill_code);
@@ -295,6 +297,7 @@ namespace Tnb.WarehouseMgr
ids.Add(WmsWareHouseConst.AdministratorOrgId);
ids.AddRange(materialIds);
ids.Add(wmsOutsourceOrderH.supplier_id);
ids.Add(tranData.Id);
ids.AddRange(unitDatas.Select(x => x.Id).ToList());
string userId = _userManager.UserId ?? WmsWareHouseConst.AdministratorUserId;
@@ -330,6 +333,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("vbillcode", wmsOutsourceH.bill_code);
erpRequestData.Add("vmemo", wmsOutsourceH.remark);
erpRequestData.Add("vtrantypecode", wmsOutsourceH.vtrantypecode);
erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x=>x.table_id==tranData.Id)?.transaction_type_id);
erpRequestData.Add("isType", 1);
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();