From ed3ec926e89c8041e85949fc6b4bd8030516ffc2 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 27 Dec 2023 14:00:55 +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/Values/ResultCodes.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs
index be0ec111..b69f95ab 100644
--- a/src/WMS.Web.Domain/Values/ResultCodes.cs
+++ b/src/WMS.Web.Domain/Values/ResultCodes.cs
@@ -24,7 +24,7 @@ namespace WMS.Web.Domain.Values
         public static ValueTuple<int, string> SourceBillNoDateError = (40005, "来源单不存在，请核对后再试");
 
         //出库任务单
-        public static ValueTuple<int, string> MergeStatusError = (70000, "所选单据数据不一致,不能合并");
+        public static ValueTuple<int, string> MergeStatusError = (70000, "请选择出库状态为”待出库”且出库类型为”销售出库”发货组织和收货客户以及发货仓库一致的数据");
         public static ValueTuple<int, string> OutStockQtyError = (70001, "可出库数量不足");
         public static ValueTuple<int, string> OutStockTaskNoData = (70002, "出库单不存在");
         public static ValueTuple<int, string> OutStockMaterialError = (70003, "出库物料在任务单中不存在");