diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 29373b7c..174e3ad4 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -211,6 +211,7 @@ namespace WMS.Web.Domain.Entitys if (list.Where(w => w.Type != OutStockType.Sal).Any()) return Result.ReFailure(ResultCodes.MergeStatusError); if (list.GroupBy(g => g.DeliveryOrgId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); if (list.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); + if (list.GroupBy(g => g.OrgCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); var details = list.SelectMany(s => s.Details).ToList().Clone(); if (list.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); List details_new = new List(); @@ -249,6 +250,7 @@ namespace WMS.Web.Domain.Entitys this.DeliveryOrgId = list.First().DeliveryOrgId; this.ReceiptCustomerId = list.First().ReceiptCustomerId; this.StockCode = list.First().StockCode; + this.OrgCode = list.First().OrgCode; this.Type = OutStockType.Sal; this.Details = details_new;