From 7a8450c65ebd626dad9219b4029f7627e85d5b42 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 2 Jul 2026 09:38:34 +0800
Subject: [PATCH 1/2] 20260702

---
 .../版本日志/HJGLDB_DS_2026-07-02_bwj.sql     |  75 +++++++++++
 HJGL_DS/BLL/Funs.cs                           | 121 +++++++++---------
 .../WeldingJointInspection.aspx.cs            |   7 +-
 .../WeldingManage/RepairItemRecordTrust.aspx  |   3 +
 .../RepairItemRecordTrust.aspx.cs             |  25 ++++
 .../RepairItemRecordTrust.aspx.designer.cs    |  75 ++++++-----
 .../WeldInspectionCheckRecord.aspx.cs         |   8 +-
 .../JGZL/WeldInspectionCheckRecord.aspx       |   2 +-
 HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx    |  82 +++++++-----
 HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs |   2 +-
 .../common/mainGdaz.aspx.designer.cs          |   9 ++
 11 files changed, 278 insertions(+), 131 deletions(-)
 create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql

diff --git a/DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql
new file mode 100644
index 0000000..f351604
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql
@@ -0,0 +1,75 @@
+
+ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecord]
+(
+   @ProjectId NVARCHAR(50)=null,
+   @ISO_ID VARCHAR(1000)=NULL,
+   @VICheckDate DATETIME=NULL,
+   @NDTR_ID VARCHAR(50)=NULL,
+   @JOTY_Group NCHAR(1)=NULL,
+   @WeldingDate datetime =null
+)
+AS
+--�ܵ��ԽӺ��ӽ�ͷ����/����¼
+SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%18 AS Num,NEWID() as New_ID,
+       Project.ProjectId,Project.ProjectCode,Project.ProjectName,batchDetail.JOT_ID,
+       joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
+       IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
+	   (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,   --������ 
+       (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_Name, --�������� 
+	   (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
+        THEN Steel.STE_Code + '/' + Steel2.STE_Code
+        WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
+        ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code,   --����
+       (CASE batchDetail.IsVI WHEN 1 THEN '��'  ELSE NULL END) AS PassVI,
+       (CASE batchDetail.IsVI WHEN 0 THEN '��'  ELSE NULL END) AS NoPassVI,
+       (CASE WHEN v.CH_TrustItemID IS NOT NULL THEN '��'  ELSE NULL END) AS IsTrust,
+       (CASE v.States WHEN '2' THEN '��' ELSE NULL END ) AS TrustState,
+       (SELECT TOP 1 ReportCode FROM dbo.HJGL_CH_TestingReportPrint report 
+        WHERE report.BatchId=batchDetail.BatchId 
+               AND report.ISO_ID=batchDetail.ISO_ID AND report.NDT_ID=v.NDT_ID 
+               AND report.Specifications=joint.JOT_JointDesc) AS ReportCode,
+			   
+joint.JOT_Location --�����
+,WeldMethod.WME_Name --���ӷ���
+,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
+	ELSE (CASE WHEN WeldSilk.WeldName IS NULL
+		 THEN ISNULL(WeldMat.WeldName,'')
+		ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --�����ƺ�
+,joint.JOT_PrepareTemp --Ԥ���¶�
+,batchDetail.Remark 
+,jointType.JOTY_Group,joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
+,weldReport.JOT_WeldDate
+FROM dbo.HJGL_BO_BatchDetail batchDetail
+LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
+LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+LEFT JOIN (SELECT top 1 trustItem.CH_TrustItemID,trust.CH_NDTMethod AS NDT_ID, trustItem.JOT_ID, trustItem.States 
+           FROM dbo.HJGL_CH_TrustItem  trustItem 
+           LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = trustItem.CH_TrustID
+           LEFT JOIN dbo.HJGL_BS_NDTType ndtType on ndtType.NDT_ID=trust.CH_NDTMethod
+           WHERE ndtType.NDT_Code LIKE '%RT%') v ON v.JOT_ID=batchDetail.JOT_ID
+		   
+LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
+LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%����%'
+LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%��˿%'
+
+left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID = joint.DReportID
+
+WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND 
+      (joint.ProjectId=@projectId OR @projectId IS NULL) AND	           
+	  (joint.ISO_ID=@ISO_ID or @ISO_ID is null)
+      AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
+      AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
+	  AND joint.DReportID is not null
+      --AND batchDetail.VICheckDate IS NOT NULL
+	  and(weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
+order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
+GO
+
+
diff --git a/HJGL_DS/BLL/Funs.cs b/HJGL_DS/BLL/Funs.cs
index 5a434d1..3f0065c 100644
--- a/HJGL_DS/BLL/Funs.cs
+++ b/HJGL_DS/BLL/Funs.cs
@@ -7,17 +7,17 @@ namespace BLL
     using System.Text.RegularExpressions;
 
     /// <summary>
-    /// ͨ�÷����ࡣ
+    /// ͨ�÷����ࡣ
     /// </summary>
     public static class Funs
     {
         /// <summary>
-        /// ά��һ��DB����
+        /// ά��һ��DB����
         /// </summary>
         private static Dictionary<int, Model.SGGLDB> dataBaseLinkList = new System.Collections.Generic.Dictionary<int, Model.SGGLDB>();
 
         /// <summary>
-        /// ά��һ��DB����
+        /// ά��һ��DB����
         /// </summary>
         public static System.Collections.Generic.Dictionary<int, Model.SGGLDB> DBList
         {
@@ -28,7 +28,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݿ������ַ���
+        /// ���ݿ������ַ���
         /// </summary>
         private static string connString;
 
@@ -38,7 +38,7 @@ namespace BLL
         public static string usingMatId;
 
         /// <summary>
-        /// ���ݿ������ַ�����
+        /// ���ݿ������ַ�����
         /// </summary>
         public static string ConnString
         {
@@ -46,7 +46,7 @@ namespace BLL
             {
                 if (connString == null)
                 {
-                    throw new NotSupportedException("�����������ַ�����");
+                    throw new NotSupportedException("�����������ַ�����");
                 }
 
                 return connString;
@@ -56,7 +56,7 @@ namespace BLL
             {
                 if (connString != null)
                 {
-                    throw new NotSupportedException("���������ã�");
+                    throw new NotSupportedException("���������ã�");
                 }
 
                 connString = value;
@@ -70,7 +70,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����
+        /// �����
         /// </summary>
         public static string UnitSet
         {
@@ -79,7 +79,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ·��
+        /// ·��
         /// </summary>
         public static string RootPath
         {
@@ -88,7 +88,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ϵͳ��
+        /// ϵͳ��
         /// </summary>
         public static string SystemName
         {
@@ -96,7 +96,7 @@ namespace BLL
             set;
         }
         /// <summary>
-        /// AD����
+        /// AD����
         /// </summary>
         public static string ADomainUrl
         {
@@ -104,7 +104,7 @@ namespace BLL
             set;
         }
         /// <summary>
-        /// APP���ص�ַ
+        /// APP���ص�ַ
         /// </summary>
         public static string APPUrl
         {
@@ -122,7 +122,7 @@ namespace BLL
 
 
         /// <summary>
-        /// ÿҳ����
+        /// ÿҳ����
         /// </summary>
         public static int PageSize
         {
@@ -131,7 +131,7 @@ namespace BLL
         } = 15;
 
         /// <summary>
-        /// ���ݿ������ġ�
+        /// ���ݿ������ġ�
         /// </summary>
         public static Model.SGGLDB DB
         {
@@ -147,50 +147,50 @@ namespace BLL
         }
 
         /// <summary>
-        /// ΪĿ����������� "��ѡ��" ��
+        /// ΪĿ����������� "��ѡ��" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void PleaseSelect(System.Web.UI.WebControls.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- ��ѡ�� -", "0"));
+            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- ��ѡ�� -", "0"));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "��ѡ��" ��
+        /// ΪĿ����������� "��ѡ��" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void FineUIPleaseSelect(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("- ��ѡ�� -", BLL.Const._Null));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("- ��ѡ�� -", BLL.Const._Null));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "���±���" ��
+        /// ΪĿ����������� "���±���" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void ReCompileSelect(System.Web.UI.WebControls.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("���±���", "0"));
+            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("���±���", "0"));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "���±���" ��
+        /// ΪĿ����������� "���±���" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void FineUIReCompileSelect(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("���±���", "0"));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("���±���", "0"));
             return;
         }
 
         /// <summary>
-        /// �ַ����Ƿ�Ϊ������
+        /// �ַ����Ƿ�Ϊ������
         /// </summary>
-        /// <param name="decimalStr">Ҫ�����ַ���</param>
-        /// <returns>�����ǻ��</returns>
+        /// <param name="decimalStr">Ҫ�����ַ���</param>
+        /// <returns>�����ǻ��</returns>
         public static bool IsDecimal(string decimalStr)
         {
             if (String.IsNullOrEmpty(decimalStr))
@@ -211,10 +211,10 @@ namespace BLL
         }
 
         /// <summary>
-        /// �ж�һ���ַ����Ƿ�������
+        /// �ж�һ���ַ����Ƿ�������
         /// </summary>
-        /// <param name="integerStr">Ҫ�����ַ���</param>
-        /// <returns>�����ǻ��</returns>
+        /// <param name="integerStr">Ҫ�����ַ���</param>
+        /// <returns>�����ǻ��</returns>
         public static bool IsInteger(string integerStr)
         {
             if (String.IsNullOrEmpty(integerStr))
@@ -235,10 +235,10 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�µ�����
+        /// ��ȡ�µ�����
         /// </summary>
-        /// <param name="number">Ҫת��������</param>
-        /// <returns>�µ�����</returns>
+        /// <param name="number">Ҫת��������</param>
+        /// <returns>�µ�����</returns>
         public static string InterceptDecimal(object number)
         {
             if (number == null)
@@ -285,11 +285,11 @@ namespace BLL
         }
 
         /// <summary>
-        /// �ж��ַ����ӵ�nλ��ʼ�Ժ��Ƿ�Ϊ0
+        /// �ж��ַ����ӵ�nλ��ʼ�Ժ��Ƿ�Ϊ0
         /// </summary>
-        /// <param name="number">Ҫ�жϵ��ַ���</param>
-        /// <param name="n">��ʼ��λ��</param>
-        /// <returns>false����Ϊ0��true��Ϊ0</returns>
+        /// <param name="number">Ҫ�жϵ��ַ���</param>
+        /// <param name="n">��ʼ��λ��</param>
+        /// <returns>false����Ϊ0��true��Ϊ0</returns>
         public static bool GetStr(string number, int n)
         {
             for (int i = n; i < number.Length; i++)
@@ -303,11 +303,11 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�ַ�������
+        /// ��ȡ�ַ�������
         /// </summary>
-        /// <param name="str">Ҫ��ȡ���ַ���</param>
-        /// <param name="n">����</param>
-        /// <returns>��ȡ���ַ���</returns>
+        /// <param name="str">Ҫ��ȡ���ַ���</param>
+        /// <param name="n">����</param>
+        /// <returns>��ȡ���ַ���</returns>
         public static string GetSubStr(object str, object n)
         {
             if (str != null)
@@ -326,7 +326,7 @@ namespace BLL
 
 
         /// <summary>
-        /// �����ı�ת��ʱ������
+        /// �����ı�ת��ʱ������
         /// </summary>
         /// <returns></returns>
         public static DateTime? GetNewDateTime(string time)
@@ -350,7 +350,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת������
+        /// �����ı�ת������
         /// </summary>
         /// <returns></returns>
         public static decimal? GetNewDecimal(string value)
@@ -374,7 +374,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת������
+        /// �����ı�ת������
         /// </summary>
         /// <returns></returns>
         public static decimal GetNewDecimalOrZero(string value)
@@ -388,7 +388,7 @@ namespace BLL
                 }
                 catch (Exception)
                 {
-                    // 如果直接解析失败（如带单位 "10M", "5KM", "3KG"），取前面的数字部分
+                    // ���ֱ�ӽ���ʧ�ܣ������λ "10M", "5KM", "3KG"����ȡǰ������ֲ���
                     try
                     {
                         Match match = Regex.Match(value, @"\d+\.?\d*");
@@ -408,7 +408,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 从qty字符串中提取单位（如 "10M" → "M", "5KG" → "KG", "33.4 mm" → "mm", "10" → ""）
+        /// ��qty�ַ�������ȡ��λ���� "10M" �� "M", "5KG" �� "KG", "33.4 mm" �� "mm", "10" �� ""��
         /// </summary>
         public static string GetUnitFromQty(string value)
         {
@@ -419,9 +419,8 @@ namespace BLL
             return "";
         }
 
-
         /// <summary>
-        /// �����ı�ת����������
+        /// �����ı�ת����������
         /// </summary>
         /// <returns></returns>
         public static int? GetNewInt(string value)
@@ -445,7 +444,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת����������
+        /// �����ı�ת����������
         /// </summary>
         /// <returns></returns>
         public static int GetNewIntOrZero(string value)
@@ -467,7 +466,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ָ���ϴ��ļ�������
+        /// ָ���ϴ��ļ�������
         /// </summary>
         /// <returns></returns>
         public static string GetNewFileName()
@@ -477,7 +476,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݱ�ʶ�����ַ���list
+        /// ���ݱ�ʶ�����ַ���list
         /// </summary>
         /// <param name="str"></param>
         /// <param name="n"></param>
@@ -494,24 +493,24 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݵ�һҳ�͵ڶ�ҳ�������ܼ�¼����ȷ����Ҫ��ӡ��ҳ
+        /// ���ݵ�һҳ�͵ڶ�ҳ�������ܼ�¼����ȷ����Ҫ��ӡ��ҳ
         /// </summary>
-        /// <param name="pageSize1">��һҳ����</param>
-        /// <param name="pageSize2">�ڶ�ҳ����</param>
-        /// <param name="count">�ܼ�¼��</param>
+        /// <param name="pageSize1">��һҳ����</param>
+        /// <param name="pageSize2">�ڶ�ҳ����</param>
+        /// <param name="count">�ܼ�¼��</param>
         /// <returns></returns>
         public static int GetPagesCountByPageSize(int pageSize1, int pageSize2, int count)
         {
             int pagesCount = 0;
-            if (pageSize1 >= count)    //�ܼ�¼��С�ڵ��ڵ�һҳ����
+            if (pageSize1 >= count)    //�ܼ�¼��С�ڵ��ڵ�һҳ����
             {
                 pagesCount = 1;
             }
-            else if (count > pageSize1 && count <= (pageSize1 + pageSize2))   //�ܼ�¼�����ڵ�һҳ������С�ڵ��ڵ�һҳ�ӵڶ�ҳ������
+            else if (count > pageSize1 && count <= (pageSize1 + pageSize2))   //�ܼ�¼�����ڵ�һҳ������С�ڵ��ڵ�һҳ�ӵڶ�ҳ������
             {
                 pagesCount = 2;
             }
-            else    //�ܼ�¼�����ڵ�һҳ�ӵڶ�ҳ������
+            else    //�ܼ�¼�����ڵ�һҳ�ӵڶ�ҳ������
             {
                 int lastCount = count - pageSize1;
                 decimal c = Convert.ToDecimal(Math.Round(Convert.ToDecimal(lastCount) / Convert.ToDecimal(pageSize2), 2));
@@ -530,7 +529,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�ϴη������
+        /// ��ȡ�ϴη������
         /// </summary>
         /// <returns></returns>
         public static string GetRepariMark(string repairMark)
diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index b0b6758..3f538ab 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -22,11 +22,16 @@ namespace FineUIPro.Web.ContinuousPrint
         {
             if (!IsPostBack)
             {
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.txtProjectCode.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode;
+                }
                 BindGrid();
+                this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
+                BindGrid1(this.CurrUser.LoginProjectId);
             }
         }
 
-
         #region 绑定Grid1
         /// <summary>
         /// 绑定Grid1
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx
index 2bc2f35..3b9d5bd 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx
@@ -208,6 +208,9 @@
         <f:MenuButton ID="btnMenuExtend" OnClick="btnMenuExtend_Click" EnablePostBack="true"
             runat="server" Text="扩拍" Icon="TableEdit">
         </f:MenuButton>
+        <f:MenuButton ID="btnIncision" OnClick="btnIncision_Click" EnablePostBack="true"
+            runat="server" Text="割口" Icon="CdrCross">
+        </f:MenuButton>
     </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs
index 17cce64..d90dc22 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs
@@ -726,5 +726,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             this.InitTreeMenu();
         }
+
+        /// <summary>
+        /// 割口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnIncision_Click(object sender, EventArgs e)
+        {
+            string repairItemRecordId = Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString();
+            var r = BLL.HJGL_CH_RepairItemRecordService.GetRepairItemRecordById(repairItemRecordId);
+            if (r != null)
+            {
+                if (r.RepairMark != "CE")
+                {
+                    r.RepairMark = "CE";
+                    Funs.DB.SubmitChanges();
+                    ShowNotify("割口成功", MessageBoxIcon.Success);
+                    BindGrid();
+                }
+                else
+                {
+                    ShowNotify("已是割口，无需重复割口！");
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs
index 8c5171f..6f3c652 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage {
-    
-    
-    public partial class RepairItemRecordTrust {
-        
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
+
+
+    public partial class RepairItemRecordTrust
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelLeftRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// drpIsProjectClosed 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsProjectClosed;
-        
+
         /// <summary>
         /// drpProjectId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectId;
-        
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree tvControlItem;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// rblIsTrust 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsTrust;
-        
+
         /// <summary>
         /// lbDef 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbDef;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnSave2 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave2;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// lbExtendedNum 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbExtendedNum;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// txtCheckPlace 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckPlace;
-        
+
         /// <summary>
         /// txtTrustRemark 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTrustRemark;
-        
+
         /// <summary>
         /// txtCheckPerson 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckPerson;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuExtend 控件。
         /// </summary>
@@ -263,5 +265,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuExtend;
+
+        /// <summary>
+        /// btnIncision 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnIncision;
     }
 }
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
index b6d3128..6feabe4 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
@@ -22,6 +22,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(drpProjectId);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                }
 
                 this.drpJointType.DataTextField = "Text";
                 this.drpJointType.DataValueField = "Value";
@@ -81,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                         left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
                         left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
                         left join Base_Project as project on project.ProjectId = batch.ProjectId
-                        LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where BatchDetail.VICheckDate IS NOT NULL ";
+                        LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
             {
@@ -113,7 +117,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
 
             Grid1.DataSource = table;
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
index c6b58ad..d3fb809 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
@@ -56,7 +56,7 @@
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道对接焊接接头报检/检查记录" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="JOT_ID,New_ID" AllowCellEditing="true" EnableColumnLines="true"
-                            ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="JOT_WeldDate,ISO_IsoNo,JOT_JointNo"
+                            ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5"
                             SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                             PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                             <Columns>
diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx
index 557c146..8c9e66b 100644
--- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx
+++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx
@@ -133,39 +133,55 @@
                         </f:Panel>
                         <f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true" Title="焊口返修超期未处理预警" AutoScroll="true">
                             <Items>
-                                <f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
-                                    ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
-                                    AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
-                                    EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
-                                            <Items>
-                                                <f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
-                                                    Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
-                                                </f:DropDownList>
-                                                <f:ToolbarFill ID="ToolbarFill3" runat="server">
-                                                </f:ToolbarFill>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
-                                            HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
-                                        </f:RenderField>
-                                        <f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
-                                            HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
-                                        </f:RenderField>
-                                        <f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
-                                            HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
-                                        </f:RenderField>
-                                        <f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
-                                            HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
-                                        </f:RenderField>
-                                        <f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                                            HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:Grid>
+                                <f:TabStrip ID="TabStrip1" ShowBorder="true" TabPosition="Top"
+            EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server" Height="285">
+            <Tabs>
+                <f:Tab Title="焊口返修超期未焊接" BodyPadding="0px" Layout="Fit" runat="server">
+                    <Items>                       
+                       <f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
+    ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
+    AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
+    EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
+    <Toolbars>
+        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
+            <Items>
+                <f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
+                    Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
+                </f:DropDownList>
+                <f:ToolbarFill ID="ToolbarFill3" runat="server">
+                </f:ToolbarFill>
+            </Items>
+        </f:Toolbar>
+    </Toolbars>
+    <Columns>
+        <f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
+            HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
+        </f:RenderField>
+        <f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
+            HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
+        </f:RenderField>
+        <f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
+            HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
+        </f:RenderField>
+        <f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
+            HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
+        </f:RenderField>
+        <f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+            HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
+        </f:RenderField>
+    </Columns>
+</f:Grid>  
+                    </Items>
+                </f:Tab>
+                <f:Tab Title="焊口返修超期未委托" BodyPadding="10px"
+                    runat="server">
+                    <Items>
+                    </Items>
+                </f:Tab>
+            </Tabs>
+        </f:TabStrip>
+
+
                             </Items>
                         </f:Panel>
                     </Items>
diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs
index 87bc8f3..57cb8ff 100644
--- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs
@@ -426,7 +426,7 @@ namespace FineUIPro.Web.common
             {
                 listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
             }
-            strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 7  order by repairItemRecord.FeedbackDate asc";
+            strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 3 and repairItemRecord.IsWeld is null order by repairItemRecord.FeedbackDate,repairItemRecord.FilmNum asc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             this.GridRepair.DataSource = tb;
diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
index aca9a21..ea6fbc9 100644
--- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
@@ -248,6 +248,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::FineUIPro.Panel Panel8;
 
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
         /// <summary>
         /// GridRepair 控件。
         /// </summary>

From 17a919d6edd9c53e0cf549a17521f64055c415ee Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 2 Jul 2026 09:59:44 +0800
Subject: [PATCH 2/2] 20260702

---
 .../WeldingJointInspection.aspx.cs            |  3 +-
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj    |  8 +-
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |  4 +-
 .../WeldInspectionCheckRecord.aspx.cs         | 77 ++++++++++---------
 HJGL_DS/FineUIPro.Web/Web.config              |  4 +-
 5 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index 3f538ab..bb7b717 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -28,7 +28,8 @@ namespace FineUIPro.Web.ContinuousPrint
                 }
                 BindGrid();
                 this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
-                BindGrid1(this.CurrUser.LoginProjectId);
+                //BindGrid1(this.CurrUser.LoginProjectId);
+                Grid1_RowClick(sender, null);
             }
         }
 
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index d347fbe..67d3094 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -7010,7 +7010,7 @@
     </Compile>
     <Compile Include="JGZL\Cover.aspx.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\Cover.aspx.designer.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index abef49a..e3436b8 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <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/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
index 6feabe4..4932586 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.drpIsoId.DataBind();
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                this.txtEndDate.Text = DateTime.Now.ToShortDateString();
+                //this.txtEndDate.Text = DateTime.Now.ToShortDateString();
 
                 // 绑定表格
                 BindGrid();
@@ -51,41 +51,48 @@ namespace FineUIPro.Web.HJGL.WeldingReport
         /// </summary>
         private void BindGrid()
         {
-            //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
-            //                          (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝' 
-            //                                WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
-            //                         v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
-            //                    FROM
-            //                      (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
-            //                         FROM  dbo.HJGL_BO_BatchDetail batchDetail
-            //                               LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
-            //                               LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
-            //                               LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
-            //                        WHERE BatchDetail.VICheckDate IS NOT NULL
-            //                             GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
-            //                       LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
-            //                       LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID    
-            //                   WHERE 1=1";
-            string strSql = @"select distinct batch.BatchCode,
-                                    batch.ProjectId,
-                                    batch.NDTR_ID,
-                                    project.ProjectCode,
-                                    project.ProjectName,
-                                    isoinfo.ISO_ID,
-                                    isoinfo.ISO_IsoNo,
-                                    batchDetail.VICheckDate,
-                                    rate.NDTR_Name,
-                                    jointType.JOTY_Group,
+            string strSql = @" select distinct batch.ProjectId,
+                                    Project.ProjectCode,
+                                    Project.ProjectName,
+                                    weldReport.JOT_WeldDate,
                                     (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝' 
-		                                    WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
-		                                     WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
-                        from HJGL_BO_BatchDetail as batchDetail
-                        left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
-                        left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
-                        left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
-                        left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
-                        left join Base_Project as project on project.ProjectId = batch.ProjectId
-                        LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
+		                            WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
+                                    WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+                                    jointType.JOTY_Group,
+                                    rate.NDTR_ID,
+                                    rate.NDTR_Name,
+                                    isoInfo.ISO_ID,
+                                    isoInfo.ISO_IsoNo,
+                                    batch.BatchCode,
+                                    batchDetail.VICheckDate
+                                    from HJGL_BO_BatchDetail batchDetail
+                            JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+                            LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+                            left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
+                            LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+                            left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
+                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
+                            LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId and joint.DReportID IS NOT NULL ";
+            //string strSql = @"select distinct batch.BatchCode,
+            //                        batch.ProjectId,
+            //                        batch.NDTR_ID,
+            //                        project.ProjectCode,
+            //                        project.ProjectName,
+            //                        isoinfo.ISO_ID,
+            //                        isoinfo.ISO_IsoNo,
+            //                        batchDetail.VICheckDate,
+            //                        rate.NDTR_Name,
+            //                        jointType.JOTY_Group,
+            //                        (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝' 
+		          //                          WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
+		          //                           WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
+            //            from HJGL_BO_BatchDetail as batchDetail
+            //            left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
+            //            left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
+            //            left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
+            //            left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
+            //            left join Base_Project as project on project.ProjectId = batch.ProjectId
+            //            LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
             {
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 1b40665..3c98f31 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -67,7 +67,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>