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-04-11 15:07:15 +08:00
parent 1c05cf2786
commit 304160e11a
7 changed files with 122 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,6 +223,48 @@ namespace WMS.Web.Api.Controllers
}
}
//剔除不是当前选中的物料
var remobox_byMaterialNumber = new List<ReceiveBoxResponse>();
return ResultList<ReceiveBoxResponse>.ReSuccess(receiveBoxList);
}
/// <summary>
/// 来源单-已收货未入库的箱集合-采购上架使用-pad-post
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
[HttpGet]
[Route("GetReceiveBox")]
public async Task<ResultList<ReceiveBoxResponse>> GetReceiveBox([FromBody] ReceiveBoxRequeset dto)
{
//找到收货的箱子
var receiveBoxList = await _inStockTaskRepositories.GetReceiveBox(dto.TaskId, dto.MaterialNumber);
//找到已入库的箱子
var instockBoxList = await _inStockRepositories.GetInstockBox(dto.TaskId);
var remobox = new List<ReceiveBoxResponse>();
if (receiveBoxList.Count != 0 && instockBoxList.Count != 0)
{
//剔除已入库的箱子
foreach (var boxid in instockBoxList.Distinct().ToList())
{
var reBox = receiveBoxList.Where(x => x.BoxId == boxid).FirstOrDefault();
if (reBox != null)
remobox.Add(reBox);
}
}
if (remobox.Count != 0)
{
foreach (var item in remobox)
{
receiveBoxList.Remove(item);
}
}
//剔除不是当前选中的物料
var remobox_byMaterialNumber = new List<ReceiveBoxResponse>();
return ResultList<ReceiveBoxResponse>.ReSuccess(receiveBoxList);
}

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

@@ -251,6 +251,13 @@
<param name="taskId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetReceiveBox(WMS.Web.Core.Dto.ReceiveBoxRequeset)">
<summary>
来源单-已收货未入库的箱集合-采购上架使用-pad-post
</summary>
<param name="taskId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchaseBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
<summary>
来源单-编号模糊查询-非采购上架使用-pad

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

@@ -2553,6 +2553,21 @@
是否作废
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ReceiveBoxRequeset">
<summary>
已收货的箱子请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ReceiveBoxRequeset.TaskId">
<summary>
任务单ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ReceiveBoxRequeset.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest">
<summary>
箱号-获取来源单信息-请求对象

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

@@ -3011,6 +3011,13 @@
<param name="taskId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetReceiveBox(System.Int32,System.String)">
<summary>
获取-已收货的箱子
</summary>
<param name="taskId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InStockTask},System.Boolean)">
<summary>
批量添加

22
src/WMS.Web.Core/Dto/InStockTask/ReceiveBoxRequeset.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 已收货的箱子请求对象
/// </summary>
public class ReceiveBoxRequeset
{
/// <summary>
/// 任务单ID
/// </summary>
public int TaskId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
}
}

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

@@ -94,6 +94,7 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<List<SourceBillNoNoPurchaseQueryResponse>> GetListInfoBy(InStockTaskBillNoQueryRequest dto);
/// <summary>
/// 获取-已收货的箱子
/// </summary>
@@ -101,6 +102,13 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId);
/// <summary>
/// 获取-已收货的箱子
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId, string materialNumber);
/// <summary>
/// 批量添加
/// </summary>

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

@@ -490,6 +490,7 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId)
{
return await _context.InstockTaskBox.Where(x => x.TaskId == taskId).Select(x => new ReceiveBoxResponse()
{
TaskId = x.TaskId,
@@ -498,6 +499,26 @@ namespace WMS.Web.Repositories
}).ToListAsync();
}
/// <summary>
///
/// </summary>
/// <param name="taskId"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public async Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId, string materialNumber)
{
var list = await _context.InstockTaskBox.Include(x => x.Details).Where(x => x.TaskId == taskId).ToListAsync();
var list_last = list.Where(x => !x.Details.Any(t => t.MaterialNumber == materialNumber));
var result = list.Select(x => new ReceiveBoxResponse()
{
TaskId = x.TaskId,
BoxId = x.BoxId,
BoxBillNo = x.BoxBillNo
}).ToList();
return result;
}
/// <summary>
/// 批量添加
/// </summary>