Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

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
             {