fix

AutoTurnOver.DB/daily.cs

@@ -1032,9 +1032,9 @@ where 1=1 ";
             {
                 sql = @"select t2.id, t2.platform, t2.bailun_sku,t3.warehouse_name, t2.warehouse_code,t2.push_time 
 from dc_return_goods_push as t2 
-left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
+left join dc_base_warehouse as t3 on t2.warehouse_code = t3.warehouse_code
 where 1=1 ";
-                countSql = " select count(1) from dc_return_goods_push as t2 left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code where 1=1 ";
+                countSql = " select count(1) from dc_return_goods_push as t2 left join dc_base_warehouse as t3 on t2.warehouse_code = t3.warehouse_code where 1=1 ";
             }
             DynamicParameters parameters = new DynamicParameters();
             if (!string.IsNullOrWhiteSpace(warehousecode))
@@ -1111,8 +1111,15 @@ where 1=1 ";
                 }
                
             }
-
-            sql += " order by t1.id desc  ";
+            if (type == 1)
+            {
+                sql += " order by t2.id desc  ";
+            }
+            else
+            {
+                sql += " order by t1.id desc  ";
+            }
+          
             total = _connection.QueryFirst<int>(countSql, parameters, commandTimeout: 0);
             sql += " limit " + offset + "," + limit;
             var obj = _connection.Query<dc_auto_shortage_push_route_dto>(sql, parameters, buffered: false, commandTimeout: 0);