From 10e0c9faa01218863c31e3c1c1d3698805a9b3be Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 10 Aug 2026 17:58:19 +0800
Subject: [PATCH] 1
---
.../WeldingManage/HJGL_PW_JointInfoService.cs | 5 +++++
.../PublishProfiles/FolderProfile.pubxml.user | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
index 62d9c13..25f999f 100644
--- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
+++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
@@ -1458,6 +1458,11 @@ namespace BLL
{
newWeldReportItem.JOT_Location = jotInfo.JOT_Location;
}
+ var dayReport = db.HJGL_BO_WeldReportMain.FirstOrDefault(x => x.DReportID == jotInfo.DReportID);
+ if (dayReport != null && dayReport.JOT_WeldDate != null)
+ {
+ newWeldReportItem.WeldDate = dayReport.JOT_WeldDate;
+ }
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 4322cef..54ce89f 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 17:18:29
+ 08/10/2026 17:52:37
12/31/2025 16:32:37
- 08/10/2026 17:18:29
+ 08/10/2026 17:52:37
12/17/2020 21:32:28
@@ -121,10 +121,10 @@
07/25/2012 11:48:56
- 08/10/2026 17:18:29
+ 08/10/2026 17:52:36
- 08/10/2026 17:18:29
+ 08/10/2026 17:52:36
11/28/2018 02:07:34
@@ -295,13 +295,13 @@
05/24/2018 13:38:24
- 08/10/2026 17:18:35
+ 08/10/2026 17:52:43
07/28/2025 11:00:31
- 08/10/2026 17:18:35
+ 08/10/2026 17:52:43
02/01/2018 12:17:18
@@ -337,10 +337,10 @@
06/29/2015 16:49:52
- 08/10/2026 17:18:37
+ 08/10/2026 17:52:46
- 08/10/2026 17:18:37
+ 08/10/2026 17:52:46
01/23/2014 13:57:34
@@ -466,7 +466,7 @@
07/03/2024 11:01:07
- 08/10/2026 17:18:47
+ 08/10/2026 17:52:59
\ No newline at end of file