From d150317c04f6b7ad6b11b6441c1022797bf434f7 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 27 Nov 2023 10:52:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/TestController.cs | 9 +++++---- src/WMS.Web.Domain/Services/OutStockTaskService.cs | 8 ++++---- src/WMS.Web.Domain/Services/Public/ErpService.cs | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 9016008d..ee2ee709 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -29,7 +29,7 @@ namespace WMS.Web.Api.Controllers private readonly IBoxService _boxService; private readonly IOutStockTaskRepositories _outStockTaskRepositories; private readonly IOutStockTaskService _outStockTaskService; - public TestController(IErpService erpService, IInStockTaskService inStockTaskService, + public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService) { @@ -46,17 +46,18 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var c = await _erpService.BillQueryForSubStock(null,null); + //var c = await _erpService.BillQueryForSubStock(null,null); //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); - //var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); + // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); + var b = await _outStockTaskService.Sync(new List() { "CKRW00000339" }); //var result = await this._outStockTaskService.Sync(null); //var t=await _outStockTaskRepositories.Get(1); // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // var s = await _outStockTaskRepositories.Edit(t); - await _boxService.Sync(); + //await _boxService.Sync(); //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 01332a00..897c009b 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -333,22 +333,22 @@ namespace WMS.Web.Domain.Services } if (TransferDirect_Nos.Count() > 0) { - result = await BillQueryForDeliveryNoticeOutStock(false, TransferDirect_Nos); + result = await BillQueryForTransferDirectOutStock(false, TransferDirect_Nos); if (!result.IsSuccess) isRollback = true; } if (TransferOut_Nos.Count() > 0) { - result = await BillQueryForDeliveryNoticeOutStock(false, TransferOut_Nos); + result = await BillQueryForTransferOutOutStock(false, TransferOut_Nos); if (!result.IsSuccess) isRollback = true; } if (AssembledApp_Nos.Count() > 0) { - result = await BillQueryForDeliveryNoticeOutStock(false, AssembledApp_Nos); + result = await BillQueryForAssembledAppOutStock(false, AssembledApp_Nos); if (!result.IsSuccess) isRollback = true; } if (MisDeliveryOut_Nos.Count() > 0) { - result = await BillQueryForDeliveryNoticeOutStock(false, MisDeliveryOut_Nos); + result = await BillQueryForMisDeliveryOutStock(false, MisDeliveryOut_Nos); if (!result.IsSuccess) isRollback = true; } diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 3f486813..aa31e1ae 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1388,7 +1388,7 @@ namespace WMS.Web.Domain.Services.Public //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 @@ -1482,7 +1482,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 @@ -1574,7 +1574,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 @@ -1666,7 +1666,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 @@ -1758,7 +1758,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 @@ -1850,7 +1850,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件