From 9329de85d0f3c6c6fdc420791ed6be4c5b5d76fb Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 25 Apr 2024 17:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/InStockService.cs | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 2e4def91..353e914d 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -964,32 +964,36 @@ namespace WMS.Web.Domain.Services purchaseInStock.Details[0].Lot.Number = erpDetail.BatchBillNo; } - _logger.LogInformation($"入库单->下推成功 开始保存 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 数据: {JsonConvert.SerializeObject(purchaseInStock)}"); - var res_s = await sc_erpService.Save(purchaseInStock, formId); - if (!res_s.IsSuccess) - { - _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); - } - //提交 - _logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); - ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data - var resSubmit = await sc_erpService.Submit(o_dto, formId); - if (!resSubmit.IsSuccess) - { - _logger.LogInformation($"入库单->提交失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}"); - return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); - } - //审核 - _logger.LogInformation($"入库单->提交成功 开始审核 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); - resSubmit = await sc_erpService.Audit(o_dto, formId); - if (!resSubmit.IsSuccess) - { - _logger.LogInformation($"入库单->审核失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}"); - return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); - } - _logger.LogInformation($"入库单->同步金蝶成功->单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); - return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); + _logger.LogInformation($"入库单->暂存成功->单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); + return (Result.ReFailure("测试暂存失败",10004), SyncStatus.Fail,"", purchaseInStock.Details[0].DetailId); + + + //_logger.LogInformation($"入库单->下推成功 开始保存 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 数据: {JsonConvert.SerializeObject(purchaseInStock)}"); + //var res_s = await sc_erpService.Save(purchaseInStock, formId); + //if (!res_s.IsSuccess) + //{ + // _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); + //} + ////提交 + //_logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); + //ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data + //var resSubmit = await sc_erpService.Submit(o_dto, formId); + //if (!resSubmit.IsSuccess) + //{ + // _logger.LogInformation($"入库单->提交失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}"); + // return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); + //} + ////审核 + //_logger.LogInformation($"入库单->提交成功 开始审核 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); + //resSubmit = await sc_erpService.Audit(o_dto, formId); + //if (!resSubmit.IsSuccess) + //{ + // _logger.LogInformation($"入库单->审核失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}"); + // return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); + //} + //_logger.LogInformation($"入库单->同步金蝶成功->单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}"); + //return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First(), purchaseInStock.Details[0].DetailId); } catch (Exception ex) {