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

调整盘点结构

Browse Source
This commit is contained in:
18942506660
2023-12-07 11:31:06 +08:00
parent c5b8ec76be
commit 2086901e48
7 changed files with 112 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
View File

@@ -161,19 +161,19 @@ namespace WMS.Web.Repositories.Configuration
ent.ToTable("t_wms_takestock");
ent.HasKey(x => x.Id);
//ent.HasMany(p => p.Details)
// .WithOne()
// .HasForeignKey(p => p.Fid)
// .OnDelete(DeleteBehavior.Cascade);
ent.Property(f => f.SerialNumbers).HasConversion(
v => JsonConvert.SerializeObject(v),
v => JsonConvert.DeserializeObject<List<string>>(v));
ent.HasMany(p => p.Details)
.WithOne()
.HasForeignKey(p => p.Fid)
.OnDelete(DeleteBehavior.Cascade);
});
builder.Entity<TakeStockDetails>(ent =>
{
ent.ToTable("t_wms_takestock_details");
ent.HasKey(x => x.Id);
ent.Property(f => f.SerialNumbers).HasConversion(
v => JsonConvert.SerializeObject(v),
v => JsonConvert.DeserializeObject<List<string>>(v));
});
#endregion

52
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -173,44 +173,44 @@ namespace WMS.Web.Repositories
return (new List<TakeStockQueryInfoResponse>(), 0);
var subStocks = subStock_result.Data.ToList();
var query = _context.TakeStock
//.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
//.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.OrderByDescending(o => o.Id)
var query = _context.TakeStockDetails
.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.OrderByDescending(o => o.detail.Id)
.Where(adv => 1 == 1);
if (dto.ResultType != null)
query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType);
query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType);
if (!string.IsNullOrEmpty(dto.BillNo))
query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%"));
query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%"));
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.DateBeginDate != null)
query = query.Where(w => w.Date >= dto.DateBeginDate);
query = query.Where(w => w.order.Date >= dto.DateBeginDate);
if (dto.DateEndDate != null)
query = query.Where(w => w.Date <= dto.DateEndDate);
query = query.Where(w => w.order.Date <= dto.DateEndDate);
//组装
int total = await query.CountAsync();
var list = await query.Select(s => new TakeStockQueryInfoResponse()
{
#region dto组装
Id = s.Id,
BillNo = s.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
BeforeQty = s.BeforeQty,
AfterQty = s.AfterQty,
FinalQty = s.FinalQty,
ResultType = s.ResultType.GetRemark(),
Remark = s.Remark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
Date = s.Date.DateToStringSeconds(),
SuccessSync = s.SuccessSync== SyncStatus.Success ? "成功":"失败",
Id = s.order.Id,
BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
BeforeQty = s.detail.BeforeQty,
AfterQty = s.detail.AfterQty,
FinalQty = s.detail.FinalQty,
ResultType = s.order.ResultType.GetRemark(),
Remark = s.order.Remark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
Date = s.order.Date.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败",
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();