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

优化

Browse Source
This commit is contained in:
tongfei
2024-03-18 11:03:51 +08:00
parent c0520b5cd3
commit 896450fd23
49 changed files with 394 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -284,11 +284,13 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).ToList();
if (materials.Count != 0)
{
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).ToList();
}
}
if (companyId == 0)
@@ -314,11 +316,9 @@ namespace WMS.Web.Repositories
{
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialNumber));
}
else
query = query.Where(w => w.detail.MaterialId == 0);
}
if (!string.IsNullOrEmpty(dto.Creator))
@@ -365,12 +365,11 @@ namespace WMS.Web.Repositories
BillNo = s.order.BillNo,
Type = s.order.Type.GetRemark(),
SourceBillNo = s.detail.SourceBillNo,
MaterialId=s.detail.MaterialId,
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
Qty = s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
@@ -387,7 +386,7 @@ namespace WMS.Web.Repositories
var taskDetailsList= taskList.SelectMany(x => x.Details).Where(x=>x.AccruedQty<=0).ToList();
list.ForEach(x =>
{
var isHave= taskDetailsList.Where(t => t.MaterialId == x.MaterialId && t.Fid == x.TaskId).Any();
var isHave= taskDetailsList.Where(t => t.MaterialNumber == x.MaterialNumber && t.Fid == x.TaskId).Any();
if (isHave)
x.SuccessSync = "--";
});