diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 5fc48137..79fff1cd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -75,9 +75,9 @@ namespace Tnb.WarehouseMgr foreach (var ko in kittingOuts) { var carrys = await _db.Queryable() - .InnerJoin((a,b) => a.collocation_scheme_id == b.id) + .InnerJoin((a, b) => a.collocation_scheme_id == b.id) .Where(a => a.collocation_scheme_id == ko.collocation_scheme_id && a.is_lock == 0) - .OrderBy((a,b)=>b.seq) + .OrderBy((a, b) => b.seq) .ToListAsync(); if (carrys?.Count > 0) { @@ -158,7 +158,7 @@ namespace Tnb.WarehouseMgr var carry = await _db.Queryable().SingleAsync(it => it.id == ko.carry_id); if (carry != null) { - + WmsPointH sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id); WmsPointH ePoint = await _db.Queryable().FirstAsync(it => it.location_id == ko.location_id); if (sPoint != null && ePoint != null) @@ -236,15 +236,15 @@ namespace Tnb.WarehouseMgr var carryId = input.carryIds[^input.carryIds.Count]; var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); - var kods = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); - //当前载具对应的所有条码插入 + //载具为料架时,取所有料箱的条码 List carryMIds = new(); if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) { var carryDs = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync(); carryMIds = carryDs.Select(x => x.membercarry_id).ToList(); } + //当前载具对应的所有条码插入 Expression> whereExp = carryMIds?.Count > 0 ? a => carryMIds.Contains(a.carry_id) : a => a.carry_id == carryId; var carryCodes = await _db.Queryable().Where(whereExp).ToListAsync(); @@ -292,9 +292,7 @@ namespace Tnb.WarehouseMgr //判断当前载具是否为料架,如果是料架 清空所有料架/料箱数据, if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) { - var carryds = await _db.Queryable().Where(it => it.id == carryId).ToListAsync(); - var mids = carryds.Select(x => x.membercarry_id).ToList(); - var carrys = await _db.Queryable().Where(it => mids.Contains(it.id)).ToListAsync(); + var carrys = await _db.Queryable().Where(it => carryMIds.Contains(it.id)).ToListAsync(); carrys.Add(carry); if (carrys?.Count > 0) { @@ -330,7 +328,7 @@ namespace Tnb.WarehouseMgr if (input.IsNull()) throw new ArgumentNullException("input"); try { - + await _db.Ado.BeginTranAsync(); List kittingOutDs = new(); var kittingOuts = input.Adapt>();