From 257ab7d7e126c8998d8482be72266f6819eafce5 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 11 Dec 2023 11:29:13 +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 --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 232149 -> 232149 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 4 ++-- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 ++-- src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs | 8 ++++---- src/WMS.Web.Domain/Entitys/OutStock.cs | 4 ++-- .../Entitys/OutStockErpDetails.cs | 4 ++-- src/WMS.Web.Domain/Entitys/TakeStock.cs | 8 ++++---- .../Services/OutStockService.cs | 14 ++++++++------ .../Services/Public/ErpService.cs | 6 +++--- .../Services/TakeStockService.cs | 10 +++++----- 10 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index e4edbf8917975d23b924de12219c6bf5df7b5172..d681219ab45e27a7ce876e47e0cddf1f4576d31a 100644 GIT binary patch delta 10741 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 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 1a211074..ff15b72d 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -750,9 +750,9 @@ 业务对象表单Id（必录） - + - 单据Id + 单据编码 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index ed92d4df..9440e101 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1312,7 +1312,7 @@ 同步成功或者失败 默认是失败状态 - + 同步到金蝶后金蝶的单据Id @@ -1710,7 +1710,7 @@ 备注 - + 同步到金蝶后金蝶的单据Id diff --git a/src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs index 746866fe..69ed5aa6 100644 --- a/src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs @@ -10,10 +10,10 @@ namespace WMS.Web.Core.Dto.Erp /// public class ErpOperateDto { - public ErpOperateDto(string formId, string id) + public ErpOperateDto(string formId, string number) { this.FormId = formId; - this.Ids = id; + this.Numbers =new List() { number }; } /// /// 业务对象表单Id（必录） @@ -21,8 +21,8 @@ namespace WMS.Web.Core.Dto.Erp [JsonProperty("FormId")] public string FormId { get; set; } /// - /// 单据Id + /// 单据编码 /// - public string Ids { get; set; } + public List Numbers { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index 5812aa55..5d879efc 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -133,7 +133,7 @@ namespace WMS.Web.Domain.Entitys /// 同步金蝶(成功) /// /// - public void SyncSuccess(string sourcBillNo, int operateId,string salOutStockId) + public void SyncSuccess(string sourcBillNo, int operateId,string erpBillNo) { //foreach (var e in erpDetailIds) // this.SuccessSyncFail.Remove(e); @@ -141,7 +141,7 @@ namespace WMS.Web.Domain.Entitys foreach (var e in erpd) { e.SuccessSync = SyncStatus.Success; - e.ErpSyncId = salOutStockId; + e.ErpSyncBillNo = erpBillNo; } //所有erp明细同步成功才是整个单据成功 var erpDetails = this.Details.SelectMany(s => s.ErpDetails); diff --git a/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs index 0d31272b..d7f1f26e 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs @@ -53,7 +53,7 @@ namespace WMS.Web.Domain.Entitys /// /// 同步到金蝶后金蝶的单据Id /// - [Column("ErpSyncId")] - public string ErpSyncId { get; set; } + [Column("ErpSyncBillNo")] + public string ErpSyncBillNo { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index 38d9438a..fc645bb9 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -54,8 +54,8 @@ namespace WMS.Web.Domain.Entitys /// /// 同步到金蝶后金蝶的单据Id /// - [Column("ErpSyncId")] - public string ErpSyncId { get; set; } + [Column("ErpSyncBillNo")] + public string ErpSyncBillNo { get; set; } /// /// 明细 /// @@ -75,11 +75,11 @@ namespace WMS.Web.Domain.Entitys /// /// /// - public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpId) + public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpBillNo) { this.SuccessSync = syncStatus; this.Remark = ""; - this.ErpSyncId = erpId; + this.ErpSyncBillNo = erpBillNo; } /// /// 生成单据号 diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 49306492..ec8c9d01 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -230,7 +230,9 @@ namespace WMS.Web.Domain.Services var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key); foreach (var s in failList) { - var erp_details = entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.Erp_DetailId).ToList(); + var erp_details = entity.Details + .SelectMany(s => s.ErpDetails) + .Where(w=>w.SourceBillNo.Equals(s)).Select(s => s.Erp_DetailId).ToList(); var erpDto = new ErpPushDto() { RuleId = "DeliveryNotice-OutStock",//转换规则内码 发货通知单下推销售出库单 @@ -242,7 +244,7 @@ namespace WMS.Web.Domain.Services //下推金蝶 var res = await this.Push(erpDto, entity); if (res.result.IsSuccess) - entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpId); + entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo); else entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus); } @@ -258,7 +260,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task<(Result result, SyncStatus syncStatus, string erpId)> Push(ErpPushDto dto, OutStock entity) + private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> Push(ErpPushDto dto, OutStock entity) { var res = await _erpService.Push(dto); if (!res.IsSuccess) @@ -287,7 +289,7 @@ namespace WMS.Web.Domain.Services if (!resSubmit.IsSuccess) { _logger.LogInformation($"出库单->提交失败 单号:{entity.BillNo} 错误:{resSubmit.Message}"); - return (resSubmit, SyncStatus.SubmitFail, o_dto.Ids); + return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First()); } //审核 _logger.LogInformation($"出库单->提交成功 开始审核 单号:{entity.BillNo}"); @@ -295,10 +297,10 @@ namespace WMS.Web.Domain.Services if (!resSubmit.IsSuccess) { _logger.LogInformation($"出库单->审核失败 单号:{entity.BillNo} 错误:{resSubmit.Message}"); - return (resSubmit, SyncStatus.CheckFail, o_dto.Ids); + return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First()); } _logger.LogInformation($"同步金蝶成功"); - return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids); + return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First()); } } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index dd53008e..ce4d56d1 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1317,9 +1317,9 @@ namespace WMS.Web.Domain.Services.Public if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true") { - //保存成功后返回Id 后续操作根据Id操作 - string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString(); - return Result.ReSuccess(id); + //保存成功后返回number 后续操作根据Id操作 + string number = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Number"].ToString(); + return Result.ReSuccess(number); } var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString(); diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 815b297c..3eea9771 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -197,7 +197,7 @@ namespace WMS.Web.Domain.Services FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain; //操作金蝶 var resSync = await ErpOperate(dto, type); - entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpId); + entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpBillNo); await _takeStockRepositories.Edit(entity, true); return res; } @@ -207,7 +207,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task<(Result result, SyncStatus syncStatus, string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) + private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) { string formId = type.ToString(); _logger.LogInformation($"盘点单->开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}"); @@ -229,7 +229,7 @@ namespace WMS.Web.Domain.Services //if (!del_res.IsSuccess) // _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 提交失败原因: {res.Message} 删单失败原因:{del_res.Message}"); _logger.LogInformation($"盘点单->提交失败 单号:{dto.BillNo} 错误:{res.Message}"); - return (res, SyncStatus.SubmitFail, o_dto.Ids); + return (res, SyncStatus.SubmitFail, o_dto.Numbers.First()); } //审核 _logger.LogInformation($"盘点单->提交成功 开始审核 单号:{dto.BillNo}"); @@ -250,10 +250,10 @@ namespace WMS.Web.Domain.Services //if (!del_res.IsSuccess) // _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}"); _logger.LogInformation($"盘点单->审核失败 单号:{dto.BillNo} 错误:{res.Message}"); - return (res, SyncStatus.CheckFail, o_dto.Ids); + return (res, SyncStatus.CheckFail, o_dto.Numbers.First()); } _logger.LogInformation($"同步金蝶成功"); - return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids); + return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First()); } } }