diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs index e0a5314..62d9c13 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs +++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs @@ -1454,6 +1454,10 @@ namespace BLL newWeldReportItem.JOT_Location = "1G"; } } + if (!string.IsNullOrEmpty(jotInfo.JOT_Location)) + { + newWeldReportItem.JOT_Location = jotInfo.JOT_Location; + } newWeldReportItem.JOT_Size = jotInfo.JOT_Size; newWeldReportItem.JOT_DoneDin = jotInfo.JOT_Size; newWeldReportItem.JOT_Dia = jotInfo.JOT_Dia; diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index eea419c..4322cef 100644 --- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -85,13 +85,13 @@ 04/12/2024 09:54:20 - 08/10/2026 15:15:48 + 08/10/2026 17:18:29 12/31/2025 16:32:37 - 08/10/2026 15:15:48 + 08/10/2026 17:18:29 12/17/2020 21:32:28 @@ -121,10 +121,10 @@ 07/25/2012 11:48:56 - 08/10/2026 15:15:48 + 08/10/2026 17:18:29 - 08/10/2026 15:15:48 + 08/10/2026 17:18:29 11/28/2018 02:07:34 @@ -295,13 +295,13 @@ 05/24/2018 13:38:24 - 08/10/2026 15:15:55 + 08/10/2026 17:18:35 07/28/2025 11:00:31 - 08/10/2026 15:15:55 + 08/10/2026 17:18:35 02/01/2018 12:17:18 @@ -337,10 +337,10 @@ 06/29/2015 16:49:52 - 08/10/2026 15:15:57 + 08/10/2026 17:18:37 - 08/10/2026 15:15:57 + 08/10/2026 17:18:37 01/23/2014 13:57:34 @@ -466,7 +466,7 @@ 07/03/2024 11:01:07 - 08/10/2026 15:16:11 + 08/10/2026 17:18:47 \ No newline at end of file