20251010 管道焊缝检测委托单

DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql

@@ -0,0 +1,52 @@
+
+ALTER PROCEDURE [dbo].[HJGL_sp_rpt_TrustItem]
+(
+   @CH_TrustID NVARCHAR(50)
+)
+AS
+/******淃커밗잿꼬보룹쇱꿎官辜데츠玖깊*******/	  
+SELECT	ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Sort,
+ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number,
+TrustItem.CH_TrustItemID,
+TrustItem.CH_TrustID,
+iso.ISO_ID,
+iso.ISO_IsoNo,
+iso.ISO_IsoNo AS ISO_Number,--데窟暠
+JointInfo.JOT_JointDesc,--보룹방목
+batch.BatchCode,
+(CASE WHEN batchDetail.PointType=2 
+      THEN JointInfo.JOT_JointNo+'K' ELSE JointInfo.JOT_JointNo END) AS JOT_JointNo,--보룹긍뵀
+(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,--보묏뵀
+
+ (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 WHEN (TrustItem.CH_Remark IS NULL OR TrustItem.CH_Remark='') AND jotR.JOT_JointNo IS NOT NULL
+      THEN isoR.ISO_IsoNo+','+jotR.JOT_JointNo+' 럿錦' ELSE batchDetail.CheckAddress END) AS CH_Remark, --구鬧
+isoClass.ISC_IsoName,
+JointInfo.JOTY_ID,
+batchDetail.PointDate
+FROM HJGL_CH_TrustItem AS TrustItem
+LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = TrustItem.JOT_ID
+LEFT JOIN dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId=TrustItem.BatchDetailId
+LEFT JOIN dbo.HJGL_BO_Batch batch on batch.BatchId=batchDetail.BatchId
+LEFT JOIN dbo.HJGL_PW_IsoInfo iso on iso.ISO_ID=JointInfo.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=JointInfo.STE_ID2
+LEFT JOIN dbo.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS repair ON batchDetail.ToRepairId=repair.RepairItemRecordId
+LEFT JOIN dbo.HJGL_PW_JointInfo AS jotR ON jotR.JOT_ID = repair.JOT_ID
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS isoR ON isoR.ISO_ID = repair.ISO_ID
+LEFT JOIN HJGL_BS_IsoClass AS isoClass ON isoClass.ISC_ID = iso.ISC_ID
+WHERE TrustItem.CH_TrustID=@CH_TrustID
+
+union
+
+SELECT 99999 as Sort,null, NEWID(), NULL,null, '鹿苟왕겜' AS ISO_IsoNo,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,null,null
+
+order by Sort
+GO
+
+

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

@@ -339,10 +339,12 @@ namespace FineUIPro.Web.ContinuousPrint
                         string isoid = rows2[0]["ISO_ID"].ToString();
                         string jotyId = rows2[0]["JOTY_ID"].ToString();
                         int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId);
+                        string pointDate = string.Format("{0:yyyy-MM-dd}", rows2[0]["PointDate"]);
                         //传参
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("JointCount", jointCount.ToString());
-                        keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString());
+                        keyValuePairs.Add("CheckCount", (rows2.Count() - 1).ToString());
+                        keyValuePairs.Add("pointDate", pointDate);
                         BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                         initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx";

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="05/28/2025 15:16:50" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="10/10/2025 21:47:40" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -41,7 +41,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFVzlc1kQTT5OpMzXzDjutdQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFPz3ajaxZMvq2A8dZOM8eLw==">
       <TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
         <Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="InstallastionName" DataType="System.String" PropName="image_series"/>
@@ -71,6 +71,7 @@ namespace FastReport
     </MsSqlDataConnection>
     <Parameter Name="JointCount" DataType="System.String"/>
     <Parameter Name="CheckCount" DataType="System.String"/>
+    <Parameter Name="pointDate" DataType="System.String"/>
   </Dictionary>
   <ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.64,159.97,30.24,89.96,398.65,32.51,39.77,85.13,77.57,66.53,81.27,479.54,70.01,313.52,241.24,557.11,273.75,623.26,623.36,155.84,311.68,467.52">
     <PageHeaderBand Name="PageHeader1" Width="623.7" Height="349.65" Guides="0,349.65,103.95,18.9,56.7,75.6,28.35,132.3,160.65,198.45,37.8,236.25,274.05,311.85">
@@ -292,10 +293,10 @@ namespace FastReport
           <TableCell Name="Cell239" Border.Lines="Left" Text="签字：" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row17" Height="26.46">
-          <TableCell Name="Cell241" Border.Lines="Right" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell241" Border.Lines="Right" Text="日期：[pointDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell242" Border.Lines="Right" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell243" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell244" Border.Lines="Left" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell244" Border.Lines="Left" Text="日期：[pointDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </PageFooterBand>