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-06-26 18:19:55 +08:00
parent c1c9000e0c 560465974a
commit 1765ebedc4
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -442,7 +442,7 @@ namespace Tnb.ProductionMgr
num = item.codeqty,
batch = item.code_batch,
unit_id = item.unit_id,
carry_id = carry.id,
carry_id = item.member_carryid,
barcode = item.barcode,
is_all_feeding = 0,
member_carry_id = item.member_carryid,

4
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2509,6 +2509,10 @@ namespace Tnb.ProductionMgr
{
worklineIds = await db.Queryable<OrganizeEntity>().Where(x => x.ParentId == eqpId && x.Category == DictConst.RegionCategoryWorklineCode && x.DeleteMark == null).Select(x => x.Id).ToListAsync();
equipIds = await db.Queryable<EqpEquipment>().Where(x => x.equip_type_id == eqpId).Select(x => x.id).ToListAsync();
if (equipIds == null || equipIds.IsEmpty())
{
equipIds.Add(eqpId);
}
}
SqlSugarPagedList<WorkOrderAdjustmentListOutput> result = await db.Queryable<PrdMoTask>()

5
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
View File

@@ -81,6 +81,7 @@ namespace Tnb.WarehouseMgr
}
Dictionary<string, object> mCarryIdDic = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToDictionaryAsync(x => x.membercarry_id, x => x.membercarry_code);
Dictionary<string, object> mCarryIdDic2 = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToDictionaryAsync(x => x.membercarry_code, x => x.membercarry_id);
Expression<Func<WmsCarryCode, bool>> whereExp = carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && mCarryIdDic.Keys?.Count > 0
? a => mCarryIdDic.Keys.Contains(a.carry_id)
: a => a.carry_id == carry.id;
@@ -115,6 +116,10 @@ namespace Tnb.WarehouseMgr
}
data = carry.Adapt<CarryQueryOutput>();
data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();
foreach (CarryCodeQueryOutput carryCodeQueryOutput in data.wmsCarryCodes)
{
carryCodeQueryOutput.member_carryid = mCarryIdDic2.GetOrDefault(carryCodeQueryOutput.member_carrycode).ToString();
}
return data;
}
}