diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 56a15257..b46308b2 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1031,6 +1031,11 @@ 明细Id + + + 发货通知单明细Id + + 数量 diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 18874dfd..49306492 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -195,6 +195,9 @@ namespace WMS.Web.Domain.Services if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + if (entity.Type == OutStockType.Sal) + await SalOutStock(entity, loginInfo); + return Result.ReSuccess(); } /// @@ -217,6 +220,7 @@ namespace WMS.Web.Domain.Services /// private async Task SalOutStock(OutStock entity, LoginInDto loginInfo) { + if (entity.Details.Count() != 1) return Result.ReSuccess(); if (entity.Type != OutStockType.Sal) return Result.ReSuccess(); if (entity.SuccessSync != SyncStatus.Fail) return Result.ReSuccess(); List failList = entity.Details.SelectMany(s => s.ErpDetails) @@ -238,7 +242,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.erpId); else entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus); } @@ -263,7 +267,7 @@ namespace WMS.Web.Domain.Services return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, ""); } string id = res.Data; - var resSalOutStock= await _erpService.BillQueryForSalOutStock(id); + var resSalOutStock = await _erpService.BillQueryForSalOutStock(id); var salOutStock = resSalOutStock.Data; salOutStock.Details[0].Qty = entity.Details[0].Qty; //{"Id":12709885,"Number":"XSCKD10629570","DIndex":0} diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 11f59bdd..559ede20 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -204,7 +204,7 @@ namespace WMS.Web.Repositories if (entity == null || entity.serial == null) return null; response.BoxId = entity.serial.BoxId; response.BoxBillNo = entity.box.BoxBillNo; - response.SubStockId = entity.boxInventory?.SubStockId ?? 0; + response.SubStockId = entity?.boxInventory?.SubStockId ?? 0; response.SerialNumber = entity.serial.SerialNumber; response.MaterialId = entity.serial.MaterialId; response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId);