diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 19c1ceb7..d02387a1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -71,10 +71,9 @@ namespace Tnb.WarehouseMgr { var carry = await _db.Queryable().FirstAsync(a => a.carry_code == input.carry_code && a.status == 1); if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在或被禁用", 500); - var carryDsLst = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); - var mCarryIdDic = carryDsLst.ToDictionary(x => x.membercarry_id, x => x.membercarry_code); - //var mIds = mCarryIdDic.Keys; - Expression> whereExp = carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0 + var mCarryIdDic = await _db.Queryable().Where(it => it.carry_id == carry.id).ToDictionaryAsync(x => x.membercarry_id, x => x.membercarry_code); + //var mCarryIdDic = carryDsLst.ToDictionary(x => x.membercarry_id, x => x.membercarry_code); + Expression> 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; @@ -87,19 +86,15 @@ namespace Tnb.WarehouseMgr }, true) .Mapper(a => a.check_conclusion = a.is_check == 1 ? "合格" : "不合格") .ToListAsync(); - if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0) + if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && mCarryIdDic?.Count > 0) { - if (carryCodes.Count < mCarryIdDic.Keys.Count) throw new AppFriendlyException("载具条码数据异常,有料箱为空", 500); + if (carryCodes.Count < mCarryIdDic.Keys?.Count) throw new AppFriendlyException("载具条码数据异常,有料箱为空", 500); var i = 0; foreach (var (_, v) in mCarryIdDic) { - carryCodes[i].member_carrycode = v ?? string.Empty; + carryCodes[i].member_carrycode = v?.ToString() ?? string.Empty; i++; } - //for (int i = 0, cnt = mCarryIdDic.Keys.Count; i < cnt; i++) - //{ - // carryCodes[i].member_carrycode = carryDsLst.Find(x => x.membercarry_id == mIds[i])?.membercarry_code ?? string.Empty; - //} } data = carry.Adapt(); data.wmsCarryCodes = carryCodes.Adapt>(); diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs index 2d5ed531..4b601663 100644 --- a/apihost/Tnb.API.Entry/Startup.cs +++ b/apihost/Tnb.API.Entry/Startup.cs @@ -63,9 +63,9 @@ public class Startup : AppStartup services.AddOverideVisualDev(); //注册任务消息通知 added by ly on 20230814 - services.AddTaskMessageNotify(); + //services.AddTaskMessageNotify(); //定时任务 - services.AddHostedService(); + //services.AddHostedService(); }