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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-01 14:20:40 +08:00
parent b6052dea49 a7d1b4fdc5
commit 72ae84d333
13 changed files with 189 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -141,7 +141,12 @@ namespace WMS.Web.Repositories
if (dto.Type != null)
query = query.Where(w => w.order.Type == (OutStockType)dto.Type);
if (dto.SuccessSync != null)
query = query.Where(w => w.order.SuccessSync == dto.SuccessSync);
{
if (dto.SuccessSync == true)
query = query.Where(w => w.order.SuccessSync == SyncStatus.Success);
else
query = query.Where(w => w.order.SuccessSync != SyncStatus.Success);
}
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (!string.IsNullOrEmpty(dto.StockCode))
@@ -160,7 +165,7 @@ namespace WMS.Web.Repositories
Type = s.order.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),

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

@@ -197,9 +197,12 @@ namespace WMS.Web.Repositories
Id = s.Id,
BillNo = s.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
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,
@@ -207,7 +210,7 @@ namespace WMS.Web.Repositories
Remark = s.Remark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
Date = s.Date.DateToStringSeconds(),
SuccessSync = s.SuccessSync==true?"成功":"失败",
SuccessSync = s.SuccessSync== SyncStatus.Success ? "成功":"失败",
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();