Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

TradeManageNew/DataNew.cs

@@ -7153,7 +7153,7 @@ end
             int? S_LeftNum = input.S_LeftNum;
             int? E_LeftNum = input.E_LeftNum;
             DateTime? S_OrderDate = new DateTime(2023, 4, 1, 0, 0, 0, 0);
-            DateTime? E_OrderDate = DateTime.Today.AddDays(1);
+            DateTime? E_OrderDate = DateTime.Today;
 
             List<TemuSKUData_List> model = null;
             #region
@@ -7192,30 +7192,30 @@ end
                 }
                 if (E_SaleNum==null)
                 {
-                    E_SaleNum = 0;
+                    E_SaleNum = 9999999;
                 }
                 switch (Day)
                 {
                     case 0:
-                        where += " and tall.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(tall.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                     case 1:
-                        where += " and t1.SaleNum between " + S_SaleNum +" and " + E_SaleNum;
+                        where += " and isnull(t1.SaleNum,0) between " + S_SaleNum +" and " + E_SaleNum;
                         break;
                     case 2:
-                        where += " and t2.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(t2.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                     case 3:
-                        where += " and t3.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(t3.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                     case 7:
-                        where += " and t7.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(t7.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                     case 14:
-                        where += " and t14.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(t14.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                     case 30:
-                        where += " and t30.SaleNum between " + S_SaleNum + " and " + E_SaleNum;
+                        where += " and isnull(t30.SaleNum,0) between " + S_SaleNum + " and " + E_SaleNum;
                         break;
                 }
             
@@ -7228,7 +7228,7 @@ end
                 }
                 if (E_LeftNum == null)
                 {
-                    E_LeftNum = 0;
+                    E_LeftNum = 9999999;
                 }
                 switch (StoreHouse)
                 {
@@ -7245,7 +7245,7 @@ end
                 }
 
             }
-            if (S_OrderDate != null && E_OrderDate != null)
+            if (input.S_OrderDate != null && input.E_OrderDate != null)
             {
 
                 S_OrderDate = input.S_OrderDate;
@@ -7336,7 +7336,7 @@ where 1=1   " + sqlPage  + " order by GoodsHJNum desc ";
             Database db = DatabaseFactory.CreateDatabase();
             DbCommand cmd = db.GetSqlStringCommand(tsql);
             db.AddInParameter(cmd, "@sDate", DbType.DateTime, S_OrderDate);
-            db.AddInParameter(cmd, "@eDate", DbType.DateTime, E_OrderDate);
+            db.AddInParameter(cmd, "@eDate", DbType.DateTime, Convert.ToDateTime(E_OrderDate).AddDays(1));
 
 
             DataSet tb = db.ExecuteDataSet(cmd);