diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index fff21c7d..f4ae79fb 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -210,7 +210,7 @@ namespace WMS.Web.Api.Controllers return Result>.ReFailure(ResultCodes.Token_Invalid_Error); List list = new List(); - if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("JD")) + if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("GD")) return Result>.ReSuccess(list); var subs = await _erpService.BillQueryForSubStock(number, orgCode); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index bbf79165..7668dd6e 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1630,6 +1630,11 @@ 备注 + + + 同步到金蝶后金蝶的单据Id + + 序列号 @@ -1641,7 +1646,7 @@ - + 同步金蝶结果 diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index 66eb5cc3..44e5008c 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys [Column("Remark")] public string Remark { get; set; } /// + /// 同步到金蝶后金蝶的单据Id + /// + [Column("ErpSyncId")] + public string ErpSyncId { get; set; } + /// /// 序列号 /// [Column("SerialNumbers")] @@ -115,10 +120,11 @@ namespace WMS.Web.Domain.Entitys /// /// /// - public void Sync(bool isSuccess, string remark, SyncStatus syncStatus) + public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpId) { this.SuccessSync = syncStatus; this.Remark = ""; + this.ErpSyncId = erpId; } /// /// 生成单据号 diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index af129b2d..efb499a5 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -161,7 +161,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); + entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpId); await _takeStockRepositories.Edit(entity, true); return res; } @@ -171,7 +171,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task<(Result result, SyncStatus syncStatus)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) + private async Task<(Result result, SyncStatus syncStatus,string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type) { string formId = type.ToString(); _logger.LogInformation($"盘点单->开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}"); @@ -179,7 +179,7 @@ namespace WMS.Web.Domain.Services if (!res_s.IsSuccess) { _logger.LogInformation($"盘点单->保存失败 单号:{dto.BillNo} 错误:{res_s.Message}"); - return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail); + return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail,""); } //提交 _logger.LogInformation($"盘点单->保存成功 开始提交 单号:{dto.BillNo}"); @@ -193,7 +193,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); + return (res, SyncStatus.SubmitFail, o_dto.Ids); } //审核 _logger.LogInformation($"盘点单->提交成功 开始审核 单号:{dto.BillNo}"); @@ -214,10 +214,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); + return (res, SyncStatus.CheckFail, o_dto.Ids); } _logger.LogInformation($"同步金蝶成功"); - return (Result.ReSuccess(), SyncStatus.Success); + return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids); } } }