18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收货-优化

Browse Source
This commit is contained in:
tongfei
2023-12-01 18:18:23 +08:00
parent c501aa2f8c
commit baf9ec4ec4
16 changed files with 350 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -172,28 +172,11 @@ namespace WMS.Web.Repositories
public async Task<InStockTask> Get(int id)
{
var entity = await _context.InStockTask
.Include(x => x.Boxs)
.Include(s => s.Details)
.FirstOrDefaultAsync(f => f.Id == id);
return entity;
}
/// <summary>
/// 实体：根据箱号
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
public async Task<InStockTask> GetBy(string boxBillNo)
{
var entity = await _context.InStockTask
.Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo))
.Include(s => s.Details)
.Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync();
return entity;
}
/// <summary>
/// 实体：根据来源单号
/// </summary>
@@ -202,7 +185,6 @@ namespace WMS.Web.Repositories
public async Task<InStockTask> GetBySource(string sourceBillNo)
{
var entity = await _context.InStockTask
.Include(s => s.Boxs)
.Include(s => s.Details)
.Where(w => w.SourceBillNo == sourceBillNo).FirstOrDefaultAsync();
@@ -210,20 +192,6 @@ namespace WMS.Web.Repositories
}
/// <summary>
/// 箱号是否绑定了任务实体:待入库和部分入库状态中
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
public async Task<bool> IsExist(string boxBillNo)
{
return await _context.InStockTask
.AsNoTracking()
.Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo))
.Include(s => s.Details)
.Where(w => (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait) && w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).AnyAsync();
}
/// <summary>
/// 列表
/// </summary>
@@ -468,7 +436,7 @@ namespace WMS.Web.Repositories
try
{
List<int> list = entitys.Select(s => s.Id).ToList();
var res = await _context.InStockTask.AsNoTracking().Include(x => x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync();
var res = await _context.InStockTask.AsNoTracking().Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.ToMapList(entitys, res);
await _context.SaveChangesAsync();
if (_transaction != null)
@@ -498,15 +466,12 @@ namespace WMS.Web.Repositories
{
var model = await _context.InStockTask
.AsNoTracking()
.Include(s => s.Boxs)
.Include(s => s.Details)
.FirstOrDefaultAsync(f => f.Id == entity.Id);
if (model == null)
return null;
_mapper.Map(entity, model);
//子集单独映射
_mapper.ToMapList(entity.Boxs, model.Boxs);
//子集单独映射
_mapper.ToMapList(entity.Details, model.Details);
await _context.SaveChangesAsync();
if (_transaction != null)