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-11-08 15:16:07 +08:00
parent c66741b561
commit a5775e6d95
16 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Repositories/InStockRepositories.cs
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,

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

@@ -103,8 +103,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);
@@ -251,7 +251,7 @@ namespace WMS.Web.Repositories
SourceBillNo=s.order.SourceBillNo,
MaterialId=s.detail.MaterialId,
StockCode=s.detail.StockCode,
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),

4
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -73,8 +73,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
if (dto.Qty.HasValue)
query = query.Where(w => w.Qty == dto.Qty);

4
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -73,8 +73,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
if (dto.OrderType.HasValue)
query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);