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

调整导出

Browse Source
This commit is contained in:
18942506660
2023-11-17 09:39:16 +08:00
parent ee94e117a9
commit db7a2062fc
8 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,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,
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
@@ -170,6 +170,7 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Qty = s.detail.Qty,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Remark = s.order.Remark
#endregion

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

@@ -198,7 +198,7 @@ namespace WMS.Web.Repositories
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId),
BeforeQty = s.BeforeQty,
AfterQty = s.AfterQty,
FinalQty = s.FinalQty,
@@ -206,7 +206,7 @@ namespace WMS.Web.Repositories
Remark = s.Remark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
Date = s.Date.DateToStringSeconds(),
SuccessSync = s.SuccessSync
SuccessSync = s.SuccessSync==true?"成功":"失败",
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();