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

列表导出-加公司ID参数

Browse Source
This commit is contained in:
tongfei
2023-12-18 16:01:44 +08:00
parent de14aa8965
commit cf0de6997f
17 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/Controllers/BackRecordController.cs
View File

@@ -54,7 +54,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<BackRecordQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<BackRecordQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list,total) = await _backRecordRepositories.GetPagedList(dto); var (list,total) = await _backRecordRepositories.GetPagedList(dto, loginInfo.UserInfo.CompanyId);
return ResultPagedList<BackRecordQueryResponse>.ReSuccess(list, total); return ResultPagedList<BackRecordQueryResponse>.ReSuccess(list, total);
} }

2
src/WMS.Web.Api/Controllers/InStockController.cs
View File

@@ -56,7 +56,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<InStockQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<InStockQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list, count) = await _inStockRepositories.GetPagedList(dto); var (list, count) = await _inStockRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId);
return ResultPagedList<InStockQueryResponse>.ReSuccess(list, count); return ResultPagedList<InStockQueryResponse>.ReSuccess(list, count);
} }

2
src/WMS.Web.Api/Controllers/InStockTaskController.cs
View File

@@ -59,7 +59,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<InStockTaskQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<InStockTaskQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list,total) = await _inStockTaskRepositories.GetPagedList(dto); var (list,total) = await _inStockTaskRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId);
return ResultPagedList<InStockTaskQueryResponse>.ReSuccess(list, total); return ResultPagedList<InStockTaskQueryResponse>.ReSuccess(list, total);
} }

6
src/WMS.Web.Api/Controllers/InventoryController.cs
View File

@@ -61,7 +61,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<InventoryDetailsQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<InventoryDetailsQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list, count) = await _inventoryDetailsRepositories.GetPagedList(dto); var (list, count) = await _inventoryDetailsRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId);
return ResultPagedList<InventoryDetailsQueryResponse>.ReSuccess(list, count); return ResultPagedList<InventoryDetailsQueryResponse>.ReSuccess(list, count);
} }
@@ -100,7 +100,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<InventoryInOutDetailsQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<InventoryInOutDetailsQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list, count) = await _inventoryInOutDetailsRepositories.GetPagedList(dto); var (list, count) = await _inventoryInOutDetailsRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId);
return ResultPagedList<InventoryInOutDetailsQueryResponse>.ReSuccess(list, count); return ResultPagedList<InventoryInOutDetailsQueryResponse>.ReSuccess(list, count);
} }
@@ -139,7 +139,7 @@ namespace WMS.Web.Api.Controllers
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<BoxInventoryQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<BoxInventoryQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list, count) = await _boxInventoryRepositories.GetPagedList(dto); var (list, count) = await _boxInventoryRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId);
return ResultPagedList<BoxInventoryQueryResponse>.ReSuccess(list, count); return ResultPagedList<BoxInventoryQueryResponse>.ReSuccess(list, count);
} }

18
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1887,11 +1887,12 @@
出入库回退记录-仓储接口 出入库回退记录-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.GetPagedList(WMS.Web.Core.Dto.BackRecordQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.GetPagedList(WMS.Web.Core.Dto.BackRecordQueryRequest,System.Int32)">
<summary> <summary>
列表-分页 列表-分页
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<param name="companyId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.Add(WMS.Web.Domain.Entitys.BackRecord,System.Boolean)"> <member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.Add(WMS.Web.Domain.Entitys.BackRecord,System.Boolean)">
@@ -1969,11 +1970,12 @@
箱库存-仓储接口 箱库存-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest,System.Int32)">
<summary> <summary>
列表-查询 列表-查询
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<param name="companyId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.GetInfoBy(System.String)"> <member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.GetInfoBy(System.String)">
@@ -2067,7 +2069,7 @@
wms入库单-仓储接口 wms入库单-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.GetPagedList(WMS.Web.Core.Dto.InStockQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.GetPagedList(WMS.Web.Core.Dto.InStockQueryRequest,System.Int32)">
<summary> <summary>
列表-分页 列表-分页
</summary> </summary>
@@ -2158,7 +2160,7 @@
入库任务-仓储接口 入库任务-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetPagedList(WMS.Web.Core.Dto.InStockTaskQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetPagedList(WMS.Web.Core.Dto.InStockTaskQueryRequest,System.Int32)">
<summary> <summary>
列表-分页 列表-分页
</summary> </summary>
@@ -2251,11 +2253,12 @@
库存相关-仓储接口 库存相关-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest,System.Int32)">
<summary> <summary>
列表-分页 列表-分页
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<param name="companyId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryDetails},System.Boolean)"> <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryDetails},System.Boolean)">
@@ -2298,11 +2301,12 @@
物料收发明细-仓储接口 物料收发明细-仓储接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest)"> <member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest,System.Int32)">
<summary> <summary>
列表-分页 列表-分页
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<param name="companyId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryInOutDetails},System.Boolean)"> <member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryInOutDetails},System.Boolean)">

3
src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs
View File

@@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<BackRecordQueryResponse> list, int total)> GetPagedList(BackRecordQueryRequest dto); Task<(List<BackRecordQueryResponse> list, int total)> GetPagedList(BackRecordQueryRequest dto, int companyId);
/// <summary> /// <summary>
/// 新增 /// 新增

3
src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs
View File

@@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure
/// 列表-查询 /// 列表-查询
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<BoxInventoryQueryResponse> list,int total)> GetPagedList(BoxInventoryQueryRequest dto); Task<(List<BoxInventoryQueryResponse> list,int total)> GetPagedList(BoxInventoryQueryRequest dto, int companyId);
/// <summary> /// <summary>
/// 明细集合-根据箱号 /// 明细集合-根据箱号

2
src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
View File

@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.Infrastructure
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<InStockQueryResponse> list,int total)> GetPagedList(InStockQueryRequest dto); Task<(List<InStockQueryResponse> list,int total)> GetPagedList(InStockQueryRequest dto,int companyId);
/// <summary> /// <summary>
/// 箱是否存在于入库单明细中；（箱是否被上架了） /// 箱是否存在于入库单明细中；（箱是否被上架了）

2
src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
View File

@@ -20,7 +20,7 @@ namespace WMS.Web.Domain.Infrastructure
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto); Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto, int companyId);
/// <summary> /// <summary>
/// 详情 /// 详情

5
src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs
View File

@@ -14,11 +14,12 @@ namespace WMS.Web.Domain.Infrastructure
public interface IInventoryDetailsRepositories public interface IInventoryDetailsRepositories
{ {
/// <summary> /// <summary>
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto); Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto, int companyId);
/// <summary> /// <summary>
/// 批量添加 /// 批量添加

3
src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs
View File

@@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
Task<(List<InventoryInOutDetailsQueryResponse> list,int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto); Task<(List<InventoryInOutDetailsQueryResponse> list,int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto, int companyId);
/// <summary> /// <summary>
/// 批量添加 /// 批量添加

12
src/WMS.Web.Repositories/BackRecordRepositories.cs
View File

@@ -59,7 +59,7 @@ namespace WMS.Web.Repositories
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto) public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合和供应商的集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -76,7 +76,7 @@ namespace WMS.Web.Repositories
List<int> ids = new List<int>(); List<int> ids = new List<int>();
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
{ {
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId); var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
ids = staffList.Where(w =>w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList(); ids = staffList.Where(w =>w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
} }
@@ -109,15 +109,15 @@ namespace WMS.Web.Repositories
BillNo=s.order.BillNo, BillNo=s.order.BillNo,
BoxBillNo = s.box.BoxBillNo, BoxBillNo = s.box.BoxBillNo,
Type = s.order.Type.GetRemark(), Type = s.order.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
CreateTime =s.order.CreateTime, CreateTime =s.order.CreateTime,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Qty = s.detail.Qty, Qty = s.detail.Qty,
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockId),
SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers), SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -166,7 +166,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(BackRecordQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(BackRecordQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto,companyId);
} }
} }
} }

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

@@ -53,8 +53,9 @@ namespace WMS.Web.Repositories
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<BoxInventoryQueryResponse> list, int total)> GetPagedList(BoxInventoryQueryRequest dto) public async Task<(List<BoxInventoryQueryResponse> list, int total)> GetPagedList(BoxInventoryQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -108,8 +109,8 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode+s.order.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockId),
SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','), SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Qty = s.detail.Qty, Qty = s.detail.Qty,
@@ -271,7 +272,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(BoxInventoryQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(BoxInventoryQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto,companyId);
} }
} }
} }

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

@@ -109,7 +109,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(InStockQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(InStockQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto, companyId);
} }
/// <summary> /// <summary>
@@ -217,7 +217,7 @@ namespace WMS.Web.Repositories
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto) public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合和供应商的集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -291,9 +291,9 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
Qty = s.detail.Qty, Qty = s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败", SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

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

@@ -419,7 +419,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(InStockTaskQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(InStockTaskQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto, companyId);
} }
/// <summary> /// <summary>
@@ -427,7 +427,7 @@ namespace WMS.Web.Repositories
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto) public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合和供应商的集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -520,13 +520,13 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
FactoryPrice = s.detail.FactoryPrice, FactoryPrice = s.detail.FactoryPrice,
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
AccruedQty = s.detail.AccruedQty, AccruedQty = s.detail.AccruedQty,
ReceiveQty = s.detail.ReceiveQty, ReceiveQty = s.detail.ReceiveQty,
RealityQty = s.detail.RealityQty, RealityQty = s.detail.RealityQty,
Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "", Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.ReceiverId.Value) : "",
ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "", Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.ShelferId.Value) : "",
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
Remark = s.detail.Remark, Remark = s.detail.Remark,

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

@@ -52,8 +52,9 @@ namespace WMS.Web.Repositories
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto) public async Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -100,9 +101,9 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode), Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode + s.OrgCode),
Qty = s.Qty, Qty = s.Qty,
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.SubStockId),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -177,7 +178,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(InventoryDetailsQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(InventoryDetailsQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto, companyId);
} }
/// <summary> /// <summary>

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

@@ -53,8 +53,9 @@ namespace WMS.Web.Repositories
/// 列表-分页 /// 列表-分页
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <param name="companyId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<(List<InventoryInOutDetailsQueryResponse> list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto) public async Task<(List<InventoryInOutDetailsQueryResponse> list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto, int companyId)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>(); var materials = new List<ErpMaterialDto>();
@@ -108,7 +109,7 @@ namespace WMS.Web.Repositories
OrderType=s.OrderType.GetRemark(), OrderType=s.OrderType.GetRemark(),
OrderBillNo=s.OrderBillNo, OrderBillNo=s.OrderBillNo,
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode), Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode+s.OrgCode),
Qty = s.Qty, Qty = s.Qty,
SurplusQty=s.SurplusQty, SurplusQty=s.SurplusQty,
CreateTime = s.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), CreateTime = s.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -155,7 +156,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(object obj, int total)> GetListField(InventoryInOutDetailsQueryRequest dto, int companyId) public async Task<(object obj, int total)> GetListField(InventoryInOutDetailsQueryRequest dto, int companyId)
{ {
return await GetPagedList(dto); return await GetPagedList(dto,companyId);
} }
} }
} }