From ae4aec95169d3994936e0f03a1bb68ea6a010480 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 28 Jul 2025 09:15:30 +0800
Subject: [PATCH 1/2] 1

---
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user               | 2 +-
 .../FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs   | 4 ++--
 HJGL_DS/WebAPI/WebAPI.csproj.user                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8aa7c11..bf54086 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
index d566e7b..5ad37b8 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;
                             }
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

From da0956b6d9c3b18470b647f8efd58392f5628837 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 28 Jul 2025 10:23:49 +0800
Subject: [PATCH 2/2] 1

---
 HJGL_DS/BLL/DropListService.cs                                  | 2 +-
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user                 | 2 +-
 HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs | 1 -
 HJGL_DS/WebAPI/WebAPI.csproj.user                               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

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 @@
         /// <returns></returns>
         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/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index bf54086..8aa7c11 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
index 5ad37b8..50d7745 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
@@ -407,7 +407,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                             {
                                 errorInfos += (i + 2) + "行, [时间段] 录入不正确</br>";
                             }
-
                         }
                         else
                         {
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index a48b337..28be9c4 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />