diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql new file mode 100644 index 0000000..3c3a8b2 --- /dev/null +++ b/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 + + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs index a3139d6..2092eca 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs +++ b/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 keyValuePairs = new Dictionary(); 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"; diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx index 31cf295..00a933b 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -41,7 +41,7 @@ namespace FastReport } - + @@ -71,6 +71,7 @@ namespace FastReport + @@ -292,10 +293,10 @@ namespace FastReport - + - +