diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs b/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs index 4ba914fc..50e838b1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs @@ -18,9 +18,6 @@ namespace Tnb.WarehouseMgr public class Dp { private HashSet set = new HashSet(); - private const int Max = int.MaxValue; - private int Min = int.MaxValue; - private int Deep = 0; /// /// 动态规划函数 diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs index 8035deb5..abbcdc7c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs @@ -42,7 +42,6 @@ namespace Tnb.WarehouseMgr dicMaterial = await _db.Queryable().ToDictionaryAsync(x => x.id, x => x.name); } var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); - List items = new(); List carryMIds = new(); if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) { @@ -50,11 +49,10 @@ namespace Tnb.WarehouseMgr carryMIds = carryDs.Select(x => x.membercarry_id).ToList(); } Expression> whereExp = carryMIds?.Count > 0 ? a => carryMIds.Contains(a.carry_id) : a => a.carry_id == carryId; - items = await _db.Queryable().Where(whereExp) - .Select() - .Mapper(it => it.material_name = (it.material_id != null && dicMaterial.ContainsKey(it.material_id)) ? dicMaterial[it.material_id].ToString() : "") - .ToListAsync(); - + var items = await _db.Queryable().Where(whereExp) + .Select() + .Mapper(it => it.material_name = (it.material_id != null && dicMaterial.ContainsKey(it.material_id)) ? dicMaterial[it.material_id].ToString() : "") + .ToListAsync(); return items ?? Enumerable.Empty(); }