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-22 11:06:06 +08:00
parent e9d775870b
commit 44f21ae5f1
6 changed files with 126 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ namespace WMS.Web.Api.Controllers
} }
/// <summary> /// <summary>
/// 来源单-编号模糊查询-pad /// 来源单-编号模糊查询-采购上架使用-pad
/// </summary> /// </summary>
/// <param name="sourceBillNo">来源单号</param> /// <param name="sourceBillNo">来源单号</param>
/// <returns></returns> /// <returns></returns>
@@ -147,7 +147,24 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null }); var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo});
return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
}
/// <summary>
/// 来源单-编号模糊查询-采购上架使用-pad
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("GetSourceOrder")]
public async Task<ResultList<SourceBillNoQueryResponse>> GetSourceOrderBy([FromBody] InStockTaskBillNoQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list = await _inStockTaskRepositories.GetListBy(dto);
return ResultList<SourceBillNoQueryResponse>.ReSuccess(list); return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
} }
@@ -164,12 +181,29 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null }); var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo });
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list); return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
} }
/// <summary> /// <summary>
/// 来源单的信息校准-对应金蝶-pad ///
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("GetSourceOrderNoPurchase")]
public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> GetSourceOrderNoPurchaseBy([FromBody] InStockTaskBillNoQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list = await _inStockTaskRepositories.GetListInfoBy(dto);
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
}
/// <summary>
/// 来源单的信息校准-采购上架使用-对应金蝶-pad
/// </summary> /// </summary>
/// <param name="sourceBillNo"></param> /// <param name="sourceBillNo"></param>
/// <returns></returns> /// <returns></returns>

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

@@ -177,11 +177,18 @@
</member> </member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrder(System.String)"> <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrder(System.String)">
<summary> <summary>
来源单-编号模糊查询-pad 来源单-编号模糊查询-采购上架使用-pad
</summary> </summary>
<param name="sourceBillNo">来源单号</param> <param name="sourceBillNo">来源单号</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
<summary>
来源单-编号模糊查询-采购上架使用-pad
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchase(System.String)"> <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchase(System.String)">
<summary> <summary>
来源单-编号模糊查询-非采购上架使用-pad 来源单-编号模糊查询-非采购上架使用-pad
@@ -189,9 +196,16 @@
<param name="sourceBillNo"></param> <param name="sourceBillNo"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchaseBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
<summary>
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Adjust(System.String)"> <member name="M:WMS.Web.Api.Controllers.InStockTaskController.Adjust(System.String)">
<summary> <summary>
来源单的信息校准-对应金蝶-pad 来源单的信息校准-采购上架使用-对应金蝶-pad
</summary> </summary>
<param name="sourceBillNo"></param> <param name="sourceBillNo"></param>
<returns></returns> <returns></returns>

4
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1270,9 +1270,9 @@
来源单据编号 来源单据编号
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest.InstockType"> <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest.StockCode">
<summary> <summary>
来源单据类型 仓库编码
</summary> </summary>
</member> </member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto"> <member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto">

4
src/WMS.Web.Core/Dto/InStockTask/InStockTaskBillNoQueryRequest.cs
View File

@@ -15,8 +15,8 @@ namespace WMS.Web.Core.Dto.InStockTask
public string SourceBillNo { get; set; } public string SourceBillNo { get; set; }
/// <summary> /// <summary>
/// 来源单据类型 /// 仓库编码
/// </summary> /// </summary>
public int? InstockType { get; set; } public string StockCode { get; set; }
} }
} }

2
src/WMS.Web.Domain/Services/InStockService.cs
View File

@@ -448,7 +448,7 @@ namespace WMS.Web.Domain.Services
var boxDetails = boxs.SelectMany(x => x.Details).GroupBy(x => x.MaterialId).Select(x => new { MaterialId = x.Key, Qty = x.Sum(t => t.Qty) }).ToList(); var boxDetails = boxs.SelectMany(x => x.Details).GroupBy(x => x.MaterialId).Select(x => new { MaterialId = x.Key, Qty = x.Sum(t => t.Qty) }).ToList();
//3.比对：false为比对失败; //3.比对：false为比对失败;
bool isRight = boxDetails.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty >= x.Qty)) && boxDetails.Count == task.Details.Count; bool isRight = boxDetails.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty >= x.Qty)) && boxDetails.Count <= task.Details.Count;
if (!isRight) if (!isRight)
return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.ContrastError); return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.ContrastError);

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

@@ -83,7 +83,7 @@ namespace WMS.Web.Repositories
var query = _context.InStockTaskDetails var query = _context.InStockTaskDetails
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (!string.IsNullOrEmpty(dto.SourceBillNo)) if (!string.IsNullOrEmpty(dto.SourceBillNo))
@@ -95,7 +95,7 @@ namespace WMS.Web.Repositories
var mids = materials.Select(x => x.MaterialId).ToList(); var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId)); query = query.Where(w => mids.Contains(w.detail.MaterialId));
} }
if (dto.SupplierId.HasValue) if (dto.SupplierId.HasValue)
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value); query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
@@ -117,9 +117,9 @@ namespace WMS.Web.Repositories
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
query = query.Where(w => w.order.ShelfTime <= dto.CreateEndDate.Value); query = query.Where(w => w.order.ShelfTime <= dto.CreateEndDate.Value);
int total = await query.CountAsync(); int total = await query.CountAsync();
var list =await query.Select(s => new InStockTaskQueryResponse() var list = await query.Select(s => new InStockTaskQueryResponse()
{ {
Id = s.order.Id, Id = s.order.Id,
DetailsId = s.detail.Id, DetailsId = s.detail.Id,
@@ -128,23 +128,23 @@ namespace WMS.Web.Repositories
Status = s.order.Status.GetRemark(), Status = s.order.Status.GetRemark(),
SourceBillNo = s.order.SourceBillNo, SourceBillNo = s.order.SourceBillNo,
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId), Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
Org = _erpBasicDataExtendService.GetOrgName(orgs,s.detail.OrgId), Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
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),
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, _loginRepositories.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, _loginRepositories.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, _loginRepositories.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"),
}).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();
return (list,total); return (list, total);
} }
/// <summary> /// <summary>
@@ -154,8 +154,8 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<InStockTask> Get(int id) public async Task<InStockTask> Get(int id)
{ {
var entity =await _context.InStockTask var entity = await _context.InStockTask
.Include(x=>x.Boxs) .Include(x => x.Boxs)
.Include(s => s.Details) .Include(s => s.Details)
.FirstOrDefaultAsync(f => f.Id == id); .FirstOrDefaultAsync(f => f.Id == id);
return entity; return entity;
@@ -168,7 +168,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<InStockTask> GetBy(string boxBillNo) public async Task<InStockTask> GetBy(string boxBillNo)
{ {
var entity= await _context.InStockTask var entity = await _context.InStockTask
.Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo)) .Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo))
.Include(s => s.Details) .Include(s => s.Details)
.Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync(); .Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync();
@@ -187,7 +187,7 @@ namespace WMS.Web.Repositories
var entity = await _context.InStockTask var entity = await _context.InStockTask
.Include(s => s.Boxs) .Include(s => s.Boxs)
.Include(s => s.Details) .Include(s => s.Details)
.Where(w => w.SourceBillNo==sourceBillNo).FirstOrDefaultAsync(); .Where(w => w.SourceBillNo == sourceBillNo).FirstOrDefaultAsync();
return entity; return entity;
@@ -214,7 +214,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<List<InStockTask>> GetList(List<int> ids) public async Task<List<InStockTask>> GetList(List<int> ids)
{ {
var entitys= await _context.InStockTask var entitys = await _context.InStockTask
.Include(s => s.Details) .Include(s => s.Details)
.Where(f => ids.Contains(f.Id)) .Where(f => ids.Contains(f.Id))
.ToListAsync(); .ToListAsync();
@@ -228,7 +228,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<List<InStockTask>> GetListBy(List<string> sourceBillNos) public async Task<List<InStockTask>> GetListBy(List<string> sourceBillNos)
{ {
var entitys= await _context.InStockTask var entitys = await _context.InStockTask
.Include(s => s.Details) .Include(s => s.Details)
.Where(w => sourceBillNos.Contains(w.SourceBillNo)) .Where(w => sourceBillNos.Contains(w.SourceBillNo))
.ToListAsync(); .ToListAsync();
@@ -252,7 +252,7 @@ namespace WMS.Web.Repositories
} }
/// <summary> /// <summary>
/// 列表-根据来源单号模糊 /// 列表-根据来源单号模糊-采购上架使用
/// </summary> /// </summary>
/// <param name="sourceBillNo"></param> /// <param name="sourceBillNo"></param>
/// <returns></returns> /// <returns></returns>
@@ -268,28 +268,29 @@ namespace WMS.Web.Repositories
var query = _context.InStockTaskDetails var query = _context.InStockTaskDetails
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status== InstockStatus.Part || w.order.Status==InstockStatus.Wait)); .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait));
if(dto.InstockType.HasValue) //仓库
query = query.Where(w => (int)w.order.Type == dto.InstockType.Value); if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(x => x.detail.StockCode == dto.StockCode);
var list = await query.Select(s => new SourceBillNoQueryResponse() var list = await query.Select(s => new SourceBillNoQueryResponse()
{ {
Id=s.order.Id, Id = s.order.Id,
DetailsId=s.detail.Id, DetailsId = s.detail.Id,
SupplierId=s.detail.SupplierId, SupplierId = s.detail.SupplierId,
OrgId=s.detail.OrgId, OrgId = s.detail.OrgId,
SourceBillNo=s.order.SourceBillNo, SourceBillNo = s.order.SourceBillNo,
MaterialId=s.detail.MaterialId, MaterialId = s.detail.MaterialId,
StockCode=s.detail.StockCode, StockCode = s.detail.StockCode,
StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode), StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
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.AccruedQty, Qty = s.detail.AccruedQty,
DeliveredQty=s.detail.DeliveredQty, DeliveredQty = s.detail.DeliveredQty,
ReceiveQty=s.detail.ReceiveQty, ReceiveQty = s.detail.ReceiveQty,
AvailableQty =s.detail.AccruedQty- s.detail.ReceiveQty- s.detail.DeliveredQty, AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty - s.detail.DeliveredQty,
Remark = s.detail.Remark Remark = s.detail.Remark
}).ToListAsync(); }).ToListAsync();
return list; return list;
@@ -311,47 +312,50 @@ namespace WMS.Web.Repositories
materials = materials_result.Data.ToList(); materials = materials_result.Data.ToList();
//这里只查状态为：部分入库和等待收货 //这里只查状态为：部分入库和等待收货
var task_query = _context.InStockTask var task_query = _context.InStockTask
.Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait)); .Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait));
if (dto.InstockType.HasValue)
task_query = task_query.Where(w => (int)w.Type == dto.InstockType.Value);
//找到头列表 //找到头列表
var taskList = await task_query var taskList = await task_query
.Select(x=>new SourceBillNoNoPurchaseQueryResponse() .Select(x => new SourceBillNoNoPurchaseQueryResponse()
{ {
Id=x.Id, Id = x.Id,
SourceBillNo=x.SourceBillNo SourceBillNo = x.SourceBillNo
}).ToListAsync(); }).ToListAsync();
if (taskList != null && taskList.Count != 0) if (taskList != null && taskList.Count != 0)
{ {
var ids = taskList.Select(x => x.Id).ToList(); var ids = taskList.Select(x => x.Id).ToList();
//找明细 //找明细
var task_details = await _context.InStockTaskDetails.Where(x => ids.Contains(x.Fid)) var query = _context.InStockTaskDetails.Where(x => ids.Contains(x.Fid));
.Select(s=>new SourceBillNoNoPurchaseDetailsQueryResponse()
{ //仓库
TaskId=s.Fid, if (!string.IsNullOrEmpty(dto.StockCode))
DetailsId=s.Id, query = query.Where(x => x.StockCode == dto.StockCode);
SupplierId = s.SupplierId,
OrgId = s.OrgId, var task_details = await query.Select(s => new SourceBillNoNoPurchaseDetailsQueryResponse()
MaterialId = s.MaterialId, {
StockCode = s.StockCode, TaskId = s.Fid,
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode), DetailsId = s.Id,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId), SupplierId = s.SupplierId,
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId), OrgId = s.OrgId,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId), MaterialId = s.MaterialId,
Qty = s.AccruedQty, StockCode = s.StockCode,
DeliveredQty = s.DeliveredQty, StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode),
Remark = s.Remark MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
}).ToListAsync(); MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Qty = s.AccruedQty,
DeliveredQty = s.DeliveredQty,
Remark = s.Remark
}).ToListAsync();
//找箱 //找箱
var task_box = await _context.InstockTaskBox.Where(x => ids.Contains(x.TaskId)) var task_box = await _context.InstockTaskBox.Where(x => ids.Contains(x.TaskId))
.Select(s => new SourceBillNoNoPurchaseBoxQueryResponse() .Select(s => new SourceBillNoNoPurchaseBoxQueryResponse()
{ {
Id = s.Id, Id = s.Id,
TaskId=s.TaskId, TaskId = s.TaskId,
BoxId = s.BoxId, BoxId = s.BoxId,
BoxBillNo = s.BoxBillNo BoxBillNo = s.BoxBillNo
}).ToListAsync(); }).ToListAsync();
//对应头赋值：明细和箱 //对应头赋值：明细和箱
foreach (var item in taskList) foreach (var item in taskList)
@@ -359,7 +363,7 @@ namespace WMS.Web.Repositories
item.Details = task_details.Where(x => x.TaskId == item.Id).ToList(); item.Details = task_details.Where(x => x.TaskId == item.Id).ToList();
item.Boxs = task_box.Where(x => x.TaskId == item.Id).ToList(); item.Boxs = task_box.Where(x => x.TaskId == item.Id).ToList();
} }
} }
return taskList; return taskList;
} }
@@ -445,7 +449,7 @@ namespace WMS.Web.Repositories
try try
{ {
List<int> list = entitys.Select(s => s.Id).ToList(); List<int> list = entitys.Select(s => s.Id).ToList();
var res = await _context.InStockTask.AsNoTracking().Include(x=>x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync(); var res = await _context.InStockTask.AsNoTracking().Include(x => x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.ToMapList(entitys, res); _mapper.ToMapList(entitys, res);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
if (_transaction != null) if (_transaction != null)
@@ -475,7 +479,7 @@ namespace WMS.Web.Repositories
{ {
var model = await _context.InStockTask var model = await _context.InStockTask
.AsNoTracking() .AsNoTracking()
.Include(s=>s.Boxs) .Include(s => s.Boxs)
.Include(s => s.Details) .Include(s => s.Details)
.FirstOrDefaultAsync(f => f.Id == entity.Id); .FirstOrDefaultAsync(f => f.Id == entity.Id);
if (model == null) if (model == null)