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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-18 09:52:46 +08:00
parent b9862b9a20
commit fb4eb5877d
12 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WMS.Web.Repositories/BoxRepositories.cs
View File

@@ -68,15 +68,15 @@ namespace WMS.Web.Repositories
var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync();
//获取物料信息 显示物料三件套
var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialId).ToList();
var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialNumber).ToList();
foreach (var r in resList)
{
foreach (var detail in r.Details)
{
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId);
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId);
detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialId == detail.MaterialId).Select(s => s.SerialNumber).ToList();
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber);
detail.MaterialNumber = detail.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber);
detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialNumber == detail.MaterialNumber).Select(s => s.SerialNumber).ToList();
}
r.TotalQty = r.Details.Sum(s => s.Qty);
}

12
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -149,10 +149,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
if (!string.IsNullOrEmpty(dto.DestBox))
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
if (dto.SrcSubStockId != null)
query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
if (dto.DestSubStockId != null)
query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId);
if (dto.SrcSubStockCode != null)
query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockCode != null)
query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -172,8 +172,8 @@ namespace WMS.Web.Repositories
DestBox = s.destBox.BoxBillNo,
Qty=s.changeBox.Qty,
DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockId),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
#endregion

12
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -161,10 +161,10 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.moveBox.Id)
.Where(adv => 1 == 1);
if (dto.SrcSubStockId != null)
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId);
if (dto.DestSubStockId != null)
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId);
if (dto.SrcSubStockCode != null)
query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockCode != null)
query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
if (!string.IsNullOrEmpty(dto.Box))
@@ -182,8 +182,8 @@ namespace WMS.Web.Repositories
#region dto组装
BillNo = s.moveBox.BillNo,
Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockId),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),

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

@@ -259,7 +259,7 @@ namespace WMS.Web.Repositories
BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode),
Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,