20250826 焊接接头报验

DataBase/版本日志/HJGLDB_DS_2025-08-26_bwj.sql

@@ -0,0 +1,68 @@
+
+
+ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecordNew]
+(
+   @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)%12 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,		   
+joint.JOT_Location --보쌈貫零
+,WeldMethod.WME_Name --보쌈렘랬
+,CASE WHEN WeldMat.WMT_MatCode IS NULL THEN ISNULL(WeldSilk.WMT_MatCode,'')
+	ELSE (CASE WHEN WeldSilk.WMT_MatCode IS NULL
+		 THEN ISNULL(WeldMat.WMT_MatCode,'')
+		ELSE (ISNULL(WeldSilk.WMT_MatCode,'') +'/'+ ISNULL(WeldMat.WMT_MatCode,'')) END) END AS WMT_MatName --보꼼탬뵀
+,joint.JOT_PrepareTemp --渡훑侊똑
+,batchDetail.Remark  
+,jointType.JOTY_Group
+,weldReport.JOT_WeldDate
+,joint.Sort1
+,joint.Sort2
+,joint.Sort3
+,joint.Sort4
+,joint.Sort5
+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 dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=joint.JOT_WeldSilk
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=joint.JOT_WeldMat
+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 in(select Id from dbo.StrToTable(@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 batchDetail.VICheckDate IS NOT NULL
+	  and weldReport.JOT_WeldDate 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
+
+

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx

@@ -78,6 +78,7 @@
                                 <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
                                     <Items>
                                         <f:Button ID="btnWeldingRecord" BoxConfigAlign="Center" Icon="Printer" runat="server" EnableAjax="false" DisableControlBeforePostBack="false" Text="焊接接头报检检查记录打印" ToolTip="焊接接头报检检查记录打印" OnClick="btnWeldingRecord_Click"></f:Button>
+                                        <f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtWeldingDate_TextChanged" Width="220px"></f:DatePicker>
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -86,6 +86,11 @@ namespace FineUIPro.Web.ContinuousPrint
                             LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+            if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim()))
+            {
+                strSql += " AND weldReport.JOT_WeldDate=@weldingDate";
+                listStr.Add(new SqlParameter("@weldingDate", this.txtWeldingDate.Text.Trim()));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid2.DataBind();
@@ -809,5 +814,10 @@ namespace FineUIPro.Web.ContinuousPrint
         //}
 
         #endregion
+
+        protected void txtWeldingDate_TextChanged(object sender, EventArgs e)
+        {
+            BindGrid1(this.Grid1.SelectedRowID);
+        }
     }
 }

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ContinuousPrint {
+namespace FineUIPro.Web.ContinuousPrint
-    
+{
-    
+
-    public partial class WeldingJointInspection {
+
-        
+    public partial class WeldingJointInspection
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// panelTopRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelTopRegion;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// panelBottomRegion 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelBottomRegion;
-        
+
         /// <summary>
         /// Grid2 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid2;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// btnWeldingRecord 控件。
         /// </summary>
@@ -155,7 +157,16 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnWeldingRecord;
-        
+
+        /// <summary>
+        /// txtWeldingDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtWeldingDate;
+
         /// <summary>
         /// labNumber 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labNumber;
-        
+
         /// <summary>
         /// hidProjectId 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidProjectId;
-        
+
         /// <summary>
         /// hidNDTR_ID 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidNDTR_ID;
-        
+
         /// <summary>
         /// hidJOTY_Group 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidJOTY_Group;
-        
+
         /// <summary>
         /// hidJOT_WeldDate 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidJOT_WeldDate;
-        
+
         /// <summary>
         /// hidProjectName 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidProjectName;
-        
+
         /// <summary>
         /// hidISO_ID 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidISO_ID;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接工作记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/19/2024 10:28:42" ReportInfo.Modified="05/28/2025 15:13:31" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/19/2024 10:28:42" ReportInfo.Modified="08/26/2025 10:14:12" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -50,7 +50,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFHhoS+C3maUrh/IF6cldgBA==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFg5uaEG725vvbd9HU2+7l7g==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="JOT_JointNo" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="06/16/2025 15:28:06" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="08/26/2025 10:21:33" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF4rQ9KnFMYQtrw/n6V6CPlQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF0vxnu5e02+t8IjlGkC6kBg==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>

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/;"/>