diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index f7ad0aa6..8088fdca 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -22,9 +22,9 @@ namespace WMS.Web.Api.Controllers { private readonly IErpService _erpService; private IInStockTaskService _inStockTaskService; - private ITransactionRepositories _transactionRepositories; - - public TestController(IErpService erpService, IInStockTaskService inStockTaskService, ITransactionRepositories transactionRepositories) + private IBasicsRepositories _transactionRepositories; + + public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBasicsRepositories transactionRepositories) { this._erpService = erpService; this._inStockTaskService = inStockTaskService; @@ -35,7 +35,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var res = await this._erpService.BillQueryForTransferDirectOutStock(); + var res = await this._erpService.BillQueryForTransferDirectOutStock(); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); var result = await this._erpService.BillQueryForMaterial(); @@ -44,6 +44,47 @@ namespace WMS.Web.Api.Controllers return JsonConvert.SerializeObject(result.Data); } + [HttpGet] + [Route("tf")] + public async Task TestTF() + { + var list1 = new List(); + 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(); + 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; + } + + + /// /// 测试:同步采购单的入库 /// @@ -56,7 +97,7 @@ namespace WMS.Web.Api.Controllers IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); bool isRollback = false; bool isTransaction = false; - + //3.同步数据 var result = await _inStockTaskService.SsynPurchaseInStock(isTransaction); if (!result.IsSuccess) isRollback = true; @@ -64,9 +105,23 @@ namespace WMS.Web.Api.Controllers //4.提交事务 var isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction); if (!isSuccess) - return Result.ReFailure(result.Message,result.Status); + return Result.ReFailure(result.Message, result.Status); return result; } } + + 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; } + } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 011587ea..eb6cf322 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -985,6 +985,11 @@ 箱号 + + + 箱号明细数量的总和 + + 比对结果:true为比对成功,false为比对失败 @@ -2430,6 +2435,21 @@ 创建时间(erp那边的创建时间) + + + 单位 + + + + + 出库开始时间 + + + + + 出库结束时间 + + 出库单任务 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 9cf16c32..5a6bad72 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -925,6 +925,16 @@ 订单明细备注 + + + 出库开始时间 + + + + + 出库结束时间 + + 出库 反写 任务单 @@ -1015,6 +1025,13 @@ + + + 同步金蝶结果 + + + + 生成单据号 @@ -1368,6 +1385,17 @@ 删除实体集合 + + + 批量添加 + + + + + + + 查询实体集合 + 获取事务 用来处理即时库存 @@ -2703,14 +2731,14 @@ - 盘盈 + 作废 - + - 盘亏 + 盘盈盘亏同步金蝶 diff --git a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs index 6fdb24a2..e1574912 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs @@ -19,6 +19,11 @@ namespace WMS.Web.Core.Dto.InStockTask /// public string BoxBillNo { get; set; } + /// + /// 箱号明细数量的总和 + /// + public decimal TotalCount { get; set; } + /// /// 比对结果:true为比对成功,false为比对失败 /// diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index a249b83b..58eb9396 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -247,6 +247,7 @@ namespace WMS.Web.Domain.Services var response = new ContrastMaterialsResponse(); response.BoxBillNo = box.BoxBillNo; response.BoxId = box.Id; + response.TotalCount = box.Details.Sum(x => x.Qty); response.IsRight = isRight; return Result.ReSuccess(response); }