diff --git a/HJGL_DS/BLL/DropListService.cs b/HJGL_DS/BLL/DropListService.cs index 23ed0dc..6d19520 100644 --- a/HJGL_DS/BLL/DropListService.cs +++ b/HJGL_DS/BLL/DropListService.cs @@ -660,7 +660,7 @@ /// public static ListItem[] OrderTimeList() { - ListItem[] lis = new ListItem[15]; + ListItem[] lis = new ListItem[14]; //DateTime dd = Convert.ToDateTime("7:00").AddDays(1); DateTime? dd = null; for (int i = 0; i < 14; i++) diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs index d566e7b..50d7745 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs @@ -398,8 +398,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString())) { string strTime = ds.Tables[0].Rows[i]["时间段"].ToString(); - - if (BLL.DropListService.OrderTimeList().Any(x => x.Value == strTime)) + var t = BLL.DropListService.OrderTimeList().FirstOrDefault(x => x.Value == strTime); + if (t != null) { usingPlan.OrderTime = strTime; } @@ -407,7 +407,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { errorInfos += (i + 2) + "行, [时间段] 录入不正确
"; } - } else {