diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs index 3cf3487c..5ea456ca 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs @@ -87,6 +87,14 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs /// 上级载具ID /// public string carry_id { get; set; } + /// + /// 子载具id + /// + public string member_carryid { get; set; } + /// + /// 子载具code + /// + public string member_carrycode { get; set; } /// /// 物品ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs index 9d7f858b..6ded7fa2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs @@ -14,4 +14,9 @@ public partial class WmsCarryCode /// [SugarColumn(IsIgnore = true)] public string material_name { get; set; } + /// + /// 子载具编号 + /// + [SugarColumn(IsIgnore = true)] + public string member_carrycode { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index d5a58f81..e5b17a29 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -10,6 +10,7 @@ using JNPF.Common.Extension; using JNPF.FriendlyException; using Mapster; using Microsoft.AspNetCore.Mvc; +using Org.BouncyCastle.Crypto; using SqlSugar; using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities.Consts; @@ -69,18 +70,21 @@ namespace Tnb.WarehouseMgr try { var carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code); - List carryCodes = new(); - if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) + List carryCodes = new(); + var carryDsLst = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); + if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0) { - var carryDs = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); - var mCarryIds = carryDs.Select(x => x.membercarry_id).ToList(); - carryCodes = await _db.Queryable().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync(); + var mIds = carryDsLst.Select(it => it.membercarry_id).ToList(); + carryCodes = await _db.Queryable().Where(it => mIds.Contains(it.carry_id)).ToListAsync(); + for (int i = 0, cnt = mIds.Count; i < cnt; i++) + { + carryCodes[i].member_carrycode = carryDsLst.Find(x => x.membercarry_id == mIds[i])?.membercarry_code ?? string.Empty; + } } else { carryCodes = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); } - data = carry.Adapt(); data.wmsCarryCodes = carryCodes.Adapt>(); @@ -88,9 +92,7 @@ namespace Tnb.WarehouseMgr catch (Exception) { await _db.Ado.RollbackTranAsync(); - //return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); } - //return ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, data); return data; } }