From 7e11ca5d4df6912bc2e94bd8d898fca3f14f4459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com>
Date: Wed, 19 Apr 2023 17:01:53 +0800
Subject: [PATCH]

---
 Epost.BLL/OrderControlBLL.cs             | 5 ++++-
 Epost.DAL/OrdersDAL.cs                   | 2 +-
 Epost.TestToolsWeb/Epost.DPS.csproj.user | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs
index 7c6e494..61c37d7 100644
--- a/Epost.BLL/OrderControlBLL.cs
+++ b/Epost.BLL/OrderControlBLL.cs
@@ -726,7 +726,10 @@ namespace Epost.BLL
                                     DataTable noadddt = dal.GetAddressNolocation(data.Block, data.Area);
                                     foreach (DataRow item in ifdt.Rows)
                                     {
-                                        d = dal.UpOrderstolocation(item["shopid"].ToString(), noadddt.Rows[i]["location"].ToString(), scanStr);
+                                        if (noadddt.Rows.Count > i)
+                                        {
+                                            d = dal.UpOrderstolocation(item["shopid"].ToString(), noadddt.Rows[i]["location"].ToString(), scanStr);
+                                        }
                                         i++;
                                     }
                                     if (d == true)
diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs
index d9ed2c2..efbbf05 100644
--- a/Epost.DAL/OrdersDAL.cs
+++ b/Epost.DAL/OrdersDAL.cs
@@ -2690,7 +2690,7 @@ namespace Epost.DAL
         #region 
         public DataTable GetOrderinfoNumber(string matchid)
         {
-            string sql = string.Format("select distinct matchid,clientname,COUNT(distinct shopid) 'shopcount',count(distinct sku) qty from Orders where matchid='" + matchid + "' group by matchid,clientname");
+            string sql = string.Format("select distinct matchid,clientname,COUNT(distinct shopid) 'shopcount',count(distinct sku) qty from Orders where matchid='" + matchid + "' and isnull(tolocation,0)>0 group by matchid,clientname");
             DataTable dt = db.GetsqlForDT(sql);
             return dt;
         }
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index 00fd366..5827539 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />