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-03 16:35:22 +08:00
parent 79eeeeb697
commit ab056052f2
8 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1015,6 +1015,11 @@
箱信息ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest">
<summary>
修改-入库任务单-明细对象

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

@@ -465,6 +465,11 @@
箱号ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.InStockTaskDetails">
<summary>
erp入库任务明细表
@@ -1201,6 +1206,20 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetBy(System.String)">
<summary>
实体：根据箱号
</summary>
<param name="boxBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.IsExist(System.String)">
<summary>
箱号是否绑定了入库任务单实体:待入库和部分入库状态中
</summary>
<param name="boxBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetList(System.Collections.Generic.List{System.Int32})">
<summary>
列表

5
src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs
View File

@@ -22,5 +22,10 @@ namespace WMS.Web.Core.Dto.InStockTask
/// 箱信息ID
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
}
}

5
src/WMS.Web.Domain/Entitys/InStockTaskBox.cs
View File

@@ -28,5 +28,10 @@ namespace WMS.Web.Domain.Entitys
/// 箱号ID
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
}
}

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

@@ -29,6 +29,20 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<InStockTask> Get(int id);
/// <summary>
/// 实体：根据箱号
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
Task<InStockTask> GetBy(string boxBillNo);
/// <summary>
/// 箱号是否绑定了入库任务单实体:待入库和部分入库状态中
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
Task<bool> IsExist(string boxBillNo);
/// <summary>
/// 列表
/// </summary>

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

@@ -26,15 +26,17 @@ namespace WMS.Web.Domain.Services
{
private readonly IMapper _mapper;
private readonly ILoginService _loginService;
private readonly IBoxRepositories _boxRepositories;
public readonly ITransactionRepositories _transactionRepositories;
private readonly IInStockRepositories _inStockRepositories;
private readonly IInStockTaskRepositories _inStockTaskRepositories;
public InStockService(IMapper mapper, ILoginService loginService,
public InStockService(IMapper mapper, ILoginService loginService, IBoxRepositories boxRepositories,
ITransactionRepositories transactionRepositories,
IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories)
{
_mapper = mapper;
_loginService = loginService;
_boxRepositories = boxRepositories;
_transactionRepositories = transactionRepositories;
_inStockRepositories = inStockRepositories;
_inStockTaskRepositories = inStockTaskRepositories;
@@ -107,6 +109,20 @@ namespace WMS.Web.Domain.Services
return Result.ReSuccess();
}
public async Task<Result<InStockTaskDetailsInfoDto>> GetInfoByBox(string boxBillNo)
{
//1.先判断：箱号已经绑定了入库任务单中；备注：业务说法就是箱是否收货了
var isBind= await _inStockTaskRepositories.IsExist(boxBillNo);
if (!isBind)
return Result<InStockTaskDetailsInfoDto>.ReFailure(ResultCodes.Box_NoBind_Task_Data);
var boxBillNos=new List<string>();
boxBillNos.Add(boxBillNo);
//2.找到箱对应的物料信息
var box= await _boxRepositories.GetBox(boxBillNos);
return null;
}
/// <summary>
/// 保存-出库单
/// </summary>

1
src/WMS.Web.Domain/Values/ResultCodes.cs
View File

@@ -31,6 +31,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple<int, string> BoxMateriaNoData = (800010, "箱对应物料信息不存在");
public static ValueTuple<int, string> ErpStockNoData = (900000, "Erp仓库信息不完整");
public static ValueTuple<int, string> Box_NoBind_Task_Data = (80001, "该箱号不在收货信息中，请核对再试！");
}
}

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

@@ -130,6 +130,34 @@ namespace WMS.Web.Repositories
.FirstOrDefaultAsync(f => f.Id == id);
}
/// <summary>
/// 实体：根据箱号
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
public async Task<InStockTask> GetBy(string boxBillNo)
{
return await _context.InStockTask
.Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo))
.Include(s => s.Details)
.Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync();
}
/// <summary>
/// 箱号是否绑定了任务实体:待入库和部分入库状态中
/// </summary>
/// <param name="boxBillNo"></param>
/// <returns></returns>
public async Task<bool> IsExist(string boxBillNo)
{
return await _context.InStockTask
.Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo))
.Include(s => s.Details)
.Where(w =>(w.Status== InstockStatus.Part || w.Status== InstockStatus.Wait) && w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).AnyAsync();
}
/// <summary>
/// 列表
/// </summary>
@@ -190,6 +218,7 @@ namespace WMS.Web.Repositories
}
/// <summary>
/// 批量添加