From 11d1cc99e1652af442cb388ffda2c63a53277adb Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 9 Apr 2026 11:31:50 +0800
Subject: [PATCH] =?UTF-8?q?20260409=20=E8=BF=94=E4=BF=AE=E7=84=8A=E7=BC=9D?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/HJGLDB_DS_2026-04-09_bwj.sql | 64 ++++++
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 8 +
.../HJGL/WeldingManage/RepairItemRecord.aspx | 6 +
.../WeldingManage/RepairItemRecord.aspx.cs | 24 ++-
.../RepairItemRecord.aspx.designer.cs | 88 +++++----
.../WeldingManage/RepairItemRecordOut.aspx | 122 ++++++++++++
.../WeldingManage/RepairItemRecordOut.aspx.cs | 183 ++++++++++++++++++
.../RepairItemRecordOut.aspx.designer.cs | 116 +++++++++++
HJGL_DS/Model/Model.cs | 36 ++++
9 files changed, 611 insertions(+), 36 deletions(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-04-09_bwj.sql
create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordOut.aspx
create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordOut.aspx.cs
create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordOut.aspx.designer.cs
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-04-09_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-04-09_bwj.sql
new file mode 100644
index 0000000..54ce951
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-04-09_bwj.sql
@@ -0,0 +1,64 @@
+
+----¼ͼ
+alter VIEW [dbo].[HJGL_View_CH_RepairItemRecord]
+/*¼ͼ*/
+AS
+SELECT
+Record.RepairItemRecordId,
+Record.ProjectId,
+Record.ISO_ID,
+Record.JOT_ID,
+Record.FilmNum,
+Record.TrustItemID,
+Record.BatchId,
+Record.RepairMark,
+Record.DefectNature,
+Record.IsWeld,
+Record.JOT_CellWelder,
+Record.JOT_FloorWelder,
+Record.WeldDate,
+Record.ConstructionPerson,
+Record.ConfirmDate,
+Record.FeedbackDate,
+Record.NDT_ID,
+Record.IsPrint,
+Record.PrintMan,
+Record.PrintDate,
+Record.TrustRemark,
+Project.ProjectCode,
+IsoInfo.ISO_IsoNo,
+JointInfo.JOT_JointNo,
+CASE Record.IsWeld WHEN 1 THEN 'True'
+ ELSE 'False' END AS IsWeldStr,
+WeldMethod.WME_Name, --ӷ
+Steel.STE_Code, --Ӳ
+CONVERT(FLOAT,JointInfo.JOT_Dia) AS JOT_Dia, --⾶
+JointInfo.JOT_PrepareTemp, --Ԥ¶
+CellWelder.WED_Code AS CellWelderCode, --
+FloorWelder.WED_Code AS FloorWelderCode, --溸
+Batch.BatchCode, --α
+RepairItem.ExtendedNum, --ĺ
+RepairItem.CheckPlace, --ص
+RepairItem.Remark, --ע
+RepairItem.CheckPerson, --Ա
+Repair.RepairTrustDate, --ί
+Repair.CH_RepairNo --ίе
+,(case when trustItem.CH_TrustItemID is not null and trustItem.States='2' then 1 else (case when repairItems.CH_RepairItemId is not null and repairItems.States='2' then 1 else 0 end) end) as States1--Ƭϸ
+,(case when trustItem.CH_TrustItemID is not null and trustItem.States!='2' then 1 else (case when repairItems.CH_RepairItemId is not null and repairItems.States!='2' then 1 else 0 end) end) as States3--Ƭ
+FROM dbo.HJGL_CH_RepairItemRecord AS Record
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId=Record.ProjectId
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON Record.ISO_ID = IsoInfo.ISO_ID
+LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = Record.JOT_ID
+LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID=JointInfo.STE_ID
+LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=Record.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=Record.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BO_Batch AS Batch ON Batch.BatchId=Record.BatchId
+LEFT JOIN dbo.HJGL_CH_RepairItem AS RepairItem ON RepairItem.RepairItemRecordId=Record.RepairItemRecordId
+LEFT JOIN dbo.HJGL_CH_Repair AS Repair ON Repair.CH_RepairID=RepairItem.CH_RepairID
+left join HJGL_CH_TrustItem as trustItem on trustItem.CH_TrustItemID = Record.TrustItemID
+left join HJGL_CH_RepairItem as repairItems on repairItems.CH_RepairItemId= Record.TrustItemID
+
+GO
+
+
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index 0552bc7..eeb9fc5 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1181,6 +1181,7 @@
+
@@ -6282,6 +6283,13 @@
RepairItemRecord.aspx
+
+ RepairItemRecordOut.aspx
+ ASPXCodeBehind
+
+
+ RepairItemRecordOut.aspx
+
RepairItemRecordTrust.aspx
ASPXCodeBehind
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecord.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecord.aspx
index e3c1dc9..a525828 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecord.aspx
@@ -59,6 +59,8 @@
+
+
@@ -192,6 +194,10 @@
Target="Self" EnableResize="true" runat="server" IsModal="true" Width="1024px"
Height="620px">
+
+