From 8903f86d60628b78dc2bd7ad61057c06aa9fae22 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 27 Dec 2023 11:58: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

---
 src/WMS.Web.Domain/Entitys/OutStockTask.cs | 2 ++
 1 file changed, 2 insertions(+)

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<OutStockTaskDetails> details_new = new List<OutStockTaskDetails>();
@@ -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;