From 6808296461723854ec5032385cd414f9c205fb62 Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Fri, 28 Apr 2023 15:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=B9=B6=E6=8B=A3?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WMS-BS/NFine.Application/WMS/PickMaterialApp.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 24390a9..15ed500 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -2451,9 +2451,13 @@ b.InvUnit,
             DataSet ds2 = SqlHelper.GetDataSetBySql(sqlString2);
             DataTable dts1 = ds1.Tables[0];
             DataTable dts2 = ds2.Tables[0];
-            if ((dts1 != null && dts1.Rows.Count > 0) || (dts2 != null && dts2.Rows.Count > 0))
+            if ((dts1 != null && dts1.Rows.Count > 0))
             {
 
+            }
+            else if (dts2 != null && dts2.Rows.Count > 0) 
+            {
+                msg = "当前选择单据号存在已出库的单据号，合并拣料失败";
             }
             else
             {