系统的仓库标识,统一使用编码

This commit is contained in:
tongfei
2023-11-08 15:16:07 +08:00
parent c66741b561
commit a5775e6d95
16 changed files with 41 additions and 51 deletions

View File

@@ -98,8 +98,8 @@ namespace WMS.Web.Repositories
if (dto.OrgId.HasValue)
query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
if (dto.StockId.HasValue)
query = query.Where(w => w.detail.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.Type.HasValue)
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
@@ -125,7 +125,7 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
Qty =s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime =s.order.CreateTime,