优化对比接口

This commit is contained in:
tongfei
2023-11-07 11:34:37 +08:00
parent c0610b18c4
commit d4d4b37e66
5 changed files with 118 additions and 9 deletions

View File

@@ -22,9 +22,9 @@ namespace WMS.Web.Api.Controllers
{ {
private readonly IErpService _erpService; private readonly IErpService _erpService;
private IInStockTaskService _inStockTaskService; private IInStockTaskService _inStockTaskService;
private ITransactionRepositories _transactionRepositories; private IBasicsRepositories _transactionRepositories;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService, ITransactionRepositories transactionRepositories) public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBasicsRepositories transactionRepositories)
{ {
this._erpService = erpService; this._erpService = erpService;
this._inStockTaskService = inStockTaskService; this._inStockTaskService = inStockTaskService;
@@ -44,6 +44,47 @@ namespace WMS.Web.Api.Controllers
return JsonConvert.SerializeObject(result.Data); return JsonConvert.SerializeObject(result.Data);
} }
[HttpGet]
[Route("tf")]
public async Task<bool> TestTF()
{
var list1 = new List<TT1>();
var t1 = new TT1();
t1.Id = 1;
t1.Qty = 5;
var t2 = new TT1();
t2.Id = 2;
t2.Qty = 9;
var t3 = new TT1();
t3.Id = 3;
t3.Qty = 9;
list1.Add(t1);
list1.Add(t2);
list1.Add(t3);
var list2 = new List<TT2>();
var a1 = new TT2();
a1.Id = 1;
a1.Qty = 5;
var a2 = new TT2();
a2.Id = 2;
a2.Qty = 9;
var a3 = new TT2();
a3.Id = 4;
a3.Qty = 9;
list2.Add(a1);
list2.Add(a2);
list2.Add(a3);
//3.比对
bool isRight = list2.All(x => list1.Any(t => t.Id == x.Id && t.Qty == x.Qty)) && list2.Count == list1.Count;
return isRight;
}
/// <summary> /// <summary>
/// 测试:同步采购单的入库 /// 测试:同步采购单的入库
/// </summary> /// </summary>
@@ -69,4 +110,18 @@ namespace WMS.Web.Api.Controllers
} }
} }
public class TT1
{
public int Id { get; set; }
public decimal Qty { get; set; }
}
public class TT2
{
public int Id { get; set; }
public decimal Qty { get; set; }
}
} }

View File

@@ -985,6 +985,11 @@
箱号 箱号
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.TotalCount">
<summary>
箱号明细数量的总和
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.IsRight"> <member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.IsRight">
<summary> <summary>
比对结果true为比对成功false为比对失败 比对结果true为比对成功false为比对失败
@@ -2430,6 +2435,21 @@
创建时间erp那边的创建时间 创建时间erp那边的创建时间
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Unit">
<summary>
单位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockBeginTime">
<summary>
出库开始时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockEndTime">
<summary>
出库结束时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest"> <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest">
<summary> <summary>
出库单任务 出库单任务

View File

@@ -925,6 +925,16 @@
订单明细备注 订单明细备注
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.OutStockBeginTime">
<summary>
出库开始时间
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.OutStockEndTime">
<summary>
出库结束时间
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStockTaskDetails.OutStock(System.Int32,System.Decimal)"> <member name="M:WMS.Web.Domain.Entitys.OutStockTaskDetails.OutStock(System.Int32,System.Decimal)">
<summary> <summary>
出库 反写 任务单 出库 反写 任务单
@@ -1015,6 +1025,13 @@
</summary> </summary>
<param name="creatorId"></param> <param name="creatorId"></param>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String)">
<summary>
同步金蝶结果
</summary>
<param name="isSuccess"></param>
<param name="remark"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.GenerateNo"> <member name="M:WMS.Web.Domain.Entitys.TakeStock.GenerateNo">
<summary> <summary>
生成单据号 生成单据号
@@ -1368,6 +1385,17 @@
<member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.DeleteEntityList(System.Collections.Generic.List{System.Int32},System.Boolean)"> <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.DeleteEntityList(System.Collections.Generic.List{System.Int32},System.Boolean)">
删除实体集合 删除实体集合
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.ITakeStockRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.TakeStock},System.Boolean)">
<summary>
批量添加
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.ITakeStockRepositories.GetEntityList(System.Collections.Generic.List{System.Int32})">
查询实体集合
</member>
<member name="M:WMS.Web.Domain.Infrastructure.ITransactionRepositories.GetTransaction"> <member name="M:WMS.Web.Domain.Infrastructure.ITransactionRepositories.GetTransaction">
<summary> <summary>
获取事务 用来处理即时库存 获取事务 用来处理即时库存
@@ -2703,14 +2731,14 @@
</member> </member>
<member name="M:WMS.Web.Domain.Services.TakeStockService.Profit(WMS.Web.Domain.Entitys.TakeStock)"> <member name="M:WMS.Web.Domain.Services.TakeStockService.Profit(WMS.Web.Domain.Entitys.TakeStock)">
<summary> <summary>
盘盈 作废
</summary> </summary>
<param name="entity"></param> <param name="entity"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.TakeStockService.Loss(WMS.Web.Domain.Entitys.TakeStock)"> <member name="M:WMS.Web.Domain.Services.TakeStockService.Loss_Profit(WMS.Web.Domain.Entitys.TakeStock)">
<summary> <summary>
盈盘亏同步金蝶
</summary> </summary>
<param name="entity"></param> <param name="entity"></param>
<returns></returns> <returns></returns>

View File

@@ -19,6 +19,11 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary> /// </summary>
public string BoxBillNo { get; set; } public string BoxBillNo { get; set; }
/// <summary>
/// 箱号明细数量的总和
/// </summary>
public decimal TotalCount { get; set; }
/// <summary> /// <summary>
/// 比对结果true为比对成功false为比对失败 /// 比对结果true为比对成功false为比对失败
/// </summary> /// </summary>

View File

@@ -247,6 +247,7 @@ namespace WMS.Web.Domain.Services
var response = new ContrastMaterialsResponse(); var response = new ContrastMaterialsResponse();
response.BoxBillNo = box.BoxBillNo; response.BoxBillNo = box.BoxBillNo;
response.BoxId = box.Id; response.BoxId = box.Id;
response.TotalCount = box.Details.Sum(x => x.Qty);
response.IsRight = isRight; response.IsRight = isRight;
return Result<ContrastMaterialsResponse>.ReSuccess(response); return Result<ContrastMaterialsResponse>.ReSuccess(response);
} }