gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

This commit is contained in:
李超 2025-07-28 10:41:25 +08:00
parent adbce53eac da0956b6d9
commit 221f27f8ff
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/BLL/DropListService.cs
View File

@ -660,7 +660,7 @@
/// <returns></returns> /// <returns></returns>
public static ListItem[] OrderTimeList() public static ListItem[] OrderTimeList()
{ {
ListItem[] lis = new ListItem[15]; ListItem[] lis = new ListItem[14];
//DateTime dd = Convert.ToDateTime("7:00").AddDays(1); //DateTime dd = Convert.ToDateTime("7:00").AddDays(1);
DateTime? dd = null; DateTime? dd = null;
for (int i = 0; i < 14; i++) for (int i = 0; i < 14; i++)

5
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
View File

@ -398,8 +398,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString())) if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString()))
{ {
string strTime = ds.Tables[0].Rows[i]["时间段"].ToString(); string strTime = ds.Tables[0].Rows[i]["时间段"].ToString();
var t = BLL.DropListService.OrderTimeList().FirstOrDefault(x => x.Value == strTime);
if (BLL.DropListService.OrderTimeList().Any(x => x.Value == strTime)) if (t != null)
{ {
usingPlan.OrderTime = strTime; usingPlan.OrderTime = strTime;
} }
@ -407,7 +407,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
{ {
errorInfos += (i + 2) + "行, [时间段] 录入不正确</br>"; errorInfos += (i + 2) + "行, [时间段] 录入不正确</br>";
} }
} }
else else
{ {