11

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1112,7 +1112,7 @@ namespace XdCxRhDW.App.UserControl
                     foreach (var yearDir in yearDirs)
                     {
                         //每一天的db文件,倒序排列
-                        var dayFiles = Directory.EnumerateFiles(yearDir, "*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
+                        var dayFiles = Directory.EnumerateFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, yearDir), "*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
                         foreach (var dayFile in dayFiles)
                         {
                             using (RHDWPartContext db = RHDWPartContext.GetContext(dayFile))
@@ -1126,13 +1126,13 @@ namespace XdCxRhDW.App.UserControl
                             }
                         }
                     }
-                skip:
-                    if (end == DateTime.MinValue)
-                    {
-                        return new List<PosRes>();//没有数据不查询
-                    }
-                    start = end.AddHours(-(int)txtTimeCho.EditValue);
                 }
+            skip:
+                if (end == DateTime.MinValue)
+                {
+                    return new List<PosRes>();//没有数据不查询
+                }
+                start = end.AddHours(-(int)txtTimeCho.EditValue);
                 DateTime endDay = new DateTime(end.Year, end.Month, end.Day);
                 DateTime startDay = new DateTime(start.Year, start.Month, start.Day);
                 List<PosRes> list = new List<PosRes>();

XdCxRhDW.App/XlCache.cs

@@ -46,7 +46,7 @@ namespace XdCxRhDW.App
                 foreach (var yearDir in yearDirs)
                 {
                     //每一天的db文件,倒序排列
-                    var dayFiles = Directory.EnumerateFiles(yearDir, "*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
+                    var dayFiles = Directory.EnumerateFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, yearDir),"*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
                     foreach (var dayFile in dayFiles)
                     {
                         using (RHDWPartContext db = RHDWPartContext.GetContext(dayFile))