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

1

Browse Source
This commit is contained in:
周科达
2023-11-06 10:27:22 +08:00
parent aad4888c14
commit 8c8284a72d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
View File

@@ -148,6 +148,7 @@ namespace Tnb.ProductionMgr
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(generalOutstockInput.workstation_id, DictConst.RegionCategoryWorklineCode); OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(generalOutstockInput.workstation_id, DictConst.RegionCategoryWorklineCode);
List<string> materialIds = generalOutstockInput.details.Select(x => x.material_id).ToList(); List<string> materialIds = generalOutstockInput.details.Select(x => x.material_id).ToList();
List<BasMaterial> basMaterials = await db.Queryable<BasMaterial>().Where(x=>materialIds.Contains(x.id)).ToListAsync();
Dictionary<string,object> unitIdDic = await db.Queryable<BasMaterial>() Dictionary<string,object> unitIdDic = await db.Queryable<BasMaterial>()
.LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit) .LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit)
.LeftJoin<DictionaryDataEntity>((a, b, c) => b.Id == c.DictionaryTypeId && a.unit_id == c.EnCode) .LeftJoin<DictionaryDataEntity>((a, b, c) => b.Id == c.DictionaryTypeId && a.unit_id == c.EnCode)
@@ -164,7 +165,7 @@ namespace Tnb.ProductionMgr
input.outstockDs.Add(new MESWmsOutstockDInput() input.outstockDs.Add(new MESWmsOutstockDInput()
{ {
material_id = item.material_id, material_id = item.material_id,
material_code = item.material_code, material_code = basMaterials.First(x=>x.id==item.material_id).code,
pr_qty = item.num, pr_qty = item.num,
unit_id = unitIdDic[item.material_id].ToString() unit_id = unitIdDic[item.material_id].ToString()
}); });
@@ -201,8 +202,8 @@ namespace Tnb.ProductionMgr
prdOutstockDs.Add(new PrdOutstockD() prdOutstockDs.Add(new PrdOutstockD()
{ {
material_id = item.material_id, material_id = item.material_id,
material_code = item.material_code, material_code = basMaterials.First(x=>x.id==item.material_id).code,
material_name = item.material_name, material_name = basMaterials.First(x=>x.id==item.material_id).name,
pr_qty = item.num, pr_qty = item.num,
unit_id = unitIdDic[item.material_id].ToString(), unit_id = unitIdDic[item.material_id].ToString(),
outstock_id = prdOutstockH.id, outstock_id = prdOutstockH.id,