diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 01181a8a..0a854a53 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -426,27 +426,5 @@ namespace WMS.Web.Api.Controllers var data=await _erpService.BillQueryForPurchaseInStockBy("1541693",null); return true; } - - /// - /// 测试-重传 - /// - /// - /// - /// - [HttpGet] - [Route("sync/{id}")] - public async Task sync([FromRoute]int id,[FromQuery] int errorType) - { - - var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); - if (loginInfo == null || loginInfo.UserInfo == null) - return Result.ReFailure(ResultCodes.Token_Invalid_Error); - - var part = new OperateRequest(); - part.Ids = new List(); - part.Ids.Add(id); - return await _inStockService.Sync(part, loginInfo, errorType); - - } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index fad2b6cc..56d984d6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -837,13 +837,5 @@ - - - 测试-重传 - - - - - diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 4aa53e67..dc97d658 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3524,14 +3524,6 @@ - - - 同步金蝶 - - - - - 收货 @@ -5179,7 +5171,7 @@ - + 采购：同步金蝶 @@ -5187,7 +5179,7 @@ - + 下推 diff --git a/src/WMS.Web.Domain/IService/IInStockService.cs b/src/WMS.Web.Domain/IService/IInStockService.cs index dfb766ca..911d6ed0 100644 --- a/src/WMS.Web.Domain/IService/IInStockService.cs +++ b/src/WMS.Web.Domain/IService/IInStockService.cs @@ -26,14 +26,6 @@ namespace WMS.Web.Domain.IService /// Task Sync(OperateRequest dto, LoginInDto loginInfo, bool isRepeatSync = true); - /// - /// 同步金蝶 - /// - /// - /// - /// - Task Sync(OperateRequest dto, LoginInDto loginInfo, int errorType); - /// /// 收货 /// diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 226b37f2..2e4def91 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -103,28 +103,7 @@ namespace WMS.Web.Domain.Services { foreach (var entity in list) { - var res = await this.PurchaseInStock(entity, loginInfo, 0); - if (!res.IsSuccess) - _logger.LogError($"入库单同步失败:{res.Message}"); - } - }); - return Task.FromResult(Result.ReSuccess()); - } - - public Task Sync(OperateRequest dto, LoginInDto loginInfo, int errorType) - { - var list = _inStockRepositories.GetList(dto.Ids).GetAwaiter().GetResult(); - var isSuccess = true; - - list = list.Where(w => w.SuccessSync == SyncStatus.Fail).ToList(); - list.ForEach(f => f.RepeatSync()); - isSuccess = _inStockRepositories.UpdateRange(list, true).GetAwaiter().GetResult(); - - Task.Run(async () => - { - foreach (var entity in list) - { - var res = await this.PurchaseInStock(entity, loginInfo, errorType); + var res = await this.PurchaseInStock(entity, loginInfo); if (!res.IsSuccess) _logger.LogError($"入库单同步失败:{res.Message}"); } @@ -848,7 +827,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task PurchaseInStock(InStock entity, LoginInDto loginInfo, int errorType) + private async Task PurchaseInStock(InStock entity, LoginInDto loginInfo) { _logger.LogInformation($"采购下推-同步:{JsonConvert.SerializeObject(entity)} 操作人:{loginInfo.UserInfo.StaffId}"); var scope = _serviceScopeFactory.CreateScope(); @@ -913,7 +892,7 @@ namespace WMS.Web.Domain.Services else { //下推金蝶 - var res = await this.Push(erpDto, det, entity.BillNo, sc_erpService, sc_inStockRepositories, errorType); + var res = await this.Push(erpDto, det, entity.BillNo, sc_erpService, sc_inStockRepositories); if (res.result.IsSuccess) entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo); else @@ -937,7 +916,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task<(Result result, SyncStatus syncStatus, string erpBillNo, string instockDetailId)> Push(ErpPushDto dto, InStockErpDetails erpDetail, string billNo, IErpService sc_erpService, IInStockRepositories sc_inStockRepositories, int errorType) + private async Task<(Result result, SyncStatus syncStatus, string erpBillNo, string instockDetailId)> Push(ErpPushDto dto, InStockErpDetails erpDetail, string billNo, IErpService sc_erpService, IInStockRepositories sc_inStockRepositories) { var erp_instock_detId = string.Empty; try @@ -956,10 +935,7 @@ namespace WMS.Web.Domain.Services purchaseInStock.Details[0].Qty = erpDetail.Qty; string formId = dto.TargetFormId.ToString(); erp_instock_detId = purchaseInStock.Details[0].DetailId; - if (errorType == 1) - { - int tt = Convert.ToInt32("abc"); - } + //批号生成和同步 if (string.IsNullOrEmpty(erpDetail.BatchBillNo)) { @@ -995,10 +971,6 @@ namespace WMS.Web.Domain.Services _logger.LogInformation($"入库单->保存失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{res_s.Message}"); return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, "", purchaseInStock.Details[0].DetailId); } - if (errorType == 2) - { - int tt = Convert.ToInt32("abc"); - } //提交 _logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data @@ -1008,11 +980,6 @@ namespace WMS.Web.Domain.Services _logger.LogInformation($"入库单->提交失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}"); return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); } - - if (errorType == 3) - { - int tt = Convert.ToInt32("abc"); - } //审核 _logger.LogInformation($"入库单->提交成功 开始审核 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); resSubmit = await sc_erpService.Audit(o_dto, formId);