gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2025-09-25 14:07:51 +08:00
parent fade156e3d 65f0a83391
commit 559602f9dd
4 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql
+80
View File
@@ -0,0 +1,80 @@
ALTER VIEW [dbo].[HJGL_View_CH_HotProessTrustItem]
/*热处理委托明细表查询列表*/
AS
SELECT TrustItem.HotProessTrustItemId, --热处理委托明细id
TrustItem.HotProessTrustId, -- 热处理委托id
JointInfo.JOT_ID, --焊口id
ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number,
TrustItem.TrustDate,
'' as NewJotId,
IsoInfo.ISO_IsoNo,
JointInfo.ISO_ID,
(CASE WHEN record.RepairMark IS NOT NULL THEN (JointInfo.JOT_JointNo+record.RepairMark)
ELSE JointInfo.JOT_JointNo END )+ISNULL(TrustItem.HardRepairMark,'') AS JOT_JointNo,
JointInfo.DReportID,
report.JOT_WeldDate,
TrustItem.Remark,
TrustItem.TrustItemID,
TrustItem.HardTestResultId,
TrustItem.HardRepairMark,
TrustItem.IsComplete,
CASE Result.IsOK WHEN 1 THEN '是'
WHEN 0 THEN '否'
ELSE '' END AS IsOKStr,
CASE Result.IsOK WHEN 1 THEN '已完成'
WHEN 0 THEN '未完成'
ELSE '' END AS IsOKStr2,
TrustItem.ProessTypes, --热处理类型
JointInfo.JOT_JointDesc, --规格
JointInfo.ProjectId,
WeldMethod.WME_Code, --焊接方法
--(CASE WHEN Welder1.WED_Code!=Welder2.WED_Code THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, --焊工代号
(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 JointInfo.STE_ID<>JointInfo.STE_ID2 THEN Steel1.STE_Code+'/'+Steel2.STE_Code
ELSE Steel1.STE_Code END) AS STE_Code, --材质
Result.IsOK, --是否完成
cast(cast(IsoInfo.ISO_DesignPress as decimal(18,2)) as nvarchar(10))+ 'Mpa' as ISO_DesignPress --设计压力
FROM dbo.HJGL_PW_JointInfo AS JointInfo
LEFT JOIN dbo.HJGL_BS_WeldMethod WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID
LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
LEFT JOIN dbo.HJGL_BO_WeldReportMain report ON report.DReportID = JointInfo.DReportID
LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID
LEFT JOIN dbo.HJGL_CH_HotProessTrust AS Trust ON Trust.HotProessTrustId=TrustItem.HotProessTrustId
LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID
LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel1 ON JointInfo.STE_ID = Steel1.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID
LEFT JOIN dbo.HJGL_CH_HotProessResult AS Result ON Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes
GO
ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrust]
(
@HotProessTrustId nvarchar(50)
)
AS
--通过检测id获取委托单信息
BEGIN
select Project.ProjectName,
Project.ProjectCode,
c.HotProessTrustCode,
Unit.UnitName,
Users.UserName,
(select top 1 STE_Code from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as STE_Code,
(CAST(year(c.CreateDate) as varchar)+'年'+cast(month(c.CreateDate) as varchar)+'月'+cast(day(c.CreateDate) as varchar)+'日') AS CreateDate,
(select top 1 ISO_DesignPress from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as ISO_DesignPress
from dbo.HJGL_CH_HotProessTrust c
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId =c.ProjectId
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId =c.TrustUnitId
LEFT JOIN dbo.Sys_User AS Users ON Users.UserId =c.TrstManId
where c.HotProessTrustId = @HotProessTrustId
END
GO
HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx
+22 -20
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="08/12/2025 14:54:39" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="09/25/2025 13:54:53" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,12 +42,13 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF9KaaYnf752kTTcgAAMfUGw==">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFqdiXkVUXZTXWWkaVr6vXzQ==">
<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="ProjectCode" DataType="System.String" PropName="image_series"/>
<Column Name="UnitName" DataType="System.String" PropName="file_name"/>
<Column Name="HotProessTrustCode" DataType="System.String" PropName="file_size"/>
<Column Name="ISO_DesignPress" DataType="System.String" PropName="Column"/>
</TableDataSource>
<TableDataSource Name="Data" DataType="System.Int32" PropName="AttachFile" Enabled="true" TableName="Data">
<Column Name="SortNum" DataType="System.String" PropName="AttachFileId"/>
@@ -59,9 +60,9 @@ namespace FastReport
</TableDataSource>
</MsSqlDataConnection>
</Dictionary>
<ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.22,141.67,66.07,94.42,103.87,132.22,84.97,387.13,491,226.64,292.71,623.28,84.98,226.66,292.74,387.17,491.05,84.78,227.47,103.68,293.35,387.58,491.26,623.29,316.37">
<PageHeaderBand Name="PageHeader1" Width="623.7" Height="258.18" Guides="0,258.18,17.71,48.67,30.96,84.58,35.91,111.74,27.16,148.35,36.61,184.96,221.57">
<TableObject Name="Table1" Width="623.22" Height="258.18">
<ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.22,141.67,66.07,94.42,103.87,132.22,84.97,387.13,491,226.64,292.71,623.28,84.98,226.66,292.74,387.17,491.05,84.78,227.47,103.68,293.35,387.58,491.26,623.29,316.37,519.75">
<PageHeaderBand Name="PageHeader1" Width="623.7" Height="248.73" Guides="0,248.73,17.71,48.67,30.96,84.58,35.91,102.29,138.9,36.61,175.51,212.12">
<TableObject Name="Table1" Width="623.22" Height="248.73">
<TableColumn Name="Column1" Width="84.97"/>
<TableColumn Name="Column2" Width="141.67"/>
<TableColumn Name="Column3" Width="66.07"/>
@@ -69,7 +70,7 @@ namespace FastReport
<TableColumn Name="Column5" Width="103.87"/>
<TableColumn Name="Column6" Width="132.22"/>
<TableRow Name="Row1" Height="17.71">
<TableCell Name="Cell1" Text="ZDS-T6.60.005.A/0.2021" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
<TableCell Name="Cell1" Text="ZDS-T6.58.005.A/0.2025" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
<TableCell Name="Cell2" HorzAlign="Right" VertAlign="Center"/>
<TableCell Name="Cell3" HorzAlign="Right" VertAlign="Center"/>
<TableCell Name="Cell4" HorzAlign="Right" VertAlign="Center"/>
@@ -92,8 +93,8 @@ namespace FastReport
<TableCell Name="Cell15"/>
<TableCell Name="Cell28"/>
</TableRow>
<TableRow Name="Row4" Height="27.16">
<TableCell Name="Cell16" Text="共[TotalPages#]页 第[Page#]页" HorzAlign="Right" VertAlign="Center" ColSpan="6"/>
<TableRow Name="Row4" Height="17.71">
<TableCell Name="Cell16" Text="共[TotalPages#]页 第[Page#]页" HorzAlign="Center" VertAlign="Center" ColSpan="6"/>
<TableCell Name="Cell17"/>
<TableCell Name="Cell18"/>
<TableCell Name="Cell19"/>
@@ -121,20 +122,20 @@ namespace FastReport
<TableCell Name="Cell38" Border.Lines="All" Text="[MainData.HotProessTrustCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
<TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell41" Border.Lines="All" Text="管道压力等级" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell42" Border.Lines="All" Text="低中压□ 高压□ " HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell41" Border.Lines="All" Text="设计压力" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell42" Border.Lines="All" Text="[MainData.ISO_DesignPress]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow>
<TableRow Name="Row8" Height="36.61">
<TableCell Name="Cell43" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell44" Border.Lines="All" Text="设备名称或管线号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell45" Border.Lines="All" Text="焊口号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" Text="规格" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" Text="热处理类型" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" Text="规格" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" Text="热处理类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="262.18" Width="623.7" Height="37.8" Guides="0,37.8">
<DataBand Name="Data1" Top="252.73" Width="623.7" Height="37.8" Guides="0,37.8">
<TableObject Name="Table2" Width="623.28" Height="37.8" Border.Lines="Right" ManualBuildEvent="Table2_ManualBuild">
<TableColumn Name="Column24" Width="84.98"/>
<TableColumn Name="Column25" Width="141.68"/>
@@ -146,14 +147,14 @@ namespace FastReport
<TableCell Name="Cell132" Border.Lines="All" Text="[Data.SortNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell133" Border.Lines="All" Text="[Data.ISO_IsoNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell134" Border.Lines="All" Text="[Data.JOT_JointNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell135" Border.Lines="All" Text="[Data.JOT_JointDesc]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell136" Border.Lines="All" Text="[Data.STE_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell135" Border.Lines="All" Text="[Data.STE_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell136" Border.Lines="All" Text="[Data.JOT_JointDesc]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell157" Border.Lines="All" Text="[Data.ProessTypes]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow>
</TableObject>
</DataBand>
<ColumnFooterBand Name="ColumnFooter1" Top="345.78" Width="623.7">
<ChildBand Name="Child1" Top="303.98" Width="623.7" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
<ColumnFooterBand Name="ColumnFooter1" Top="336.33" Width="623.7">
<ChildBand Name="Child1" Top="294.53" Width="623.7" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
<TableObject Name="Table3" Width="623.29" Height="37.8">
<TableColumn Name="Column15" Width="84.78"/>
<TableColumn Name="Column16" Width="39.01"/>
@@ -174,12 +175,12 @@ namespace FastReport
</TableObject>
</ChildBand>
</ColumnFooterBand>
<PageFooterBand Name="PageFooter1" Top="349.78" Width="623.7" Height="104.45" Guides="0,104.45,35.15,79.25">
<PageFooterBand Name="PageFooter1" Top="340.33" Width="623.7" Height="151.7" Guides="0,104.45,35.15,79.25,113.4,151.2">
<TableObject Name="Table4" Width="623.29" Height="104.45" Border.Lines="All">
<TableColumn Name="Column22" Width="316.37"/>
<TableColumn Name="Column23" Width="306.92"/>
<TableRow Name="Row18" Height="35.15">
<TableCell Name="Cell120" Border.Lines="All" Text="委托部门（设备维修一部）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell120" Border.Lines="All" Text="委托部门（[MainData.UnitName]）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell121" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row19" Height="44.1">
@@ -191,6 +192,7 @@ namespace FastReport
<TableCell Name="Cell131" Text="年 月 日 " HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
</TableObject>
<TextObject Name="Text1" Top="113.4" Width="519.75" Height="37.8" Text="注：1.本委托单一式二份，一份委托部门自存，一份交热处理单位现场施工使用。&#13;&#10;2.热处理类别：消氢热处理、预热、后热、焊后热处理。&#13;&#10;" VertAlign="Center"/>
</PageFooterBand>
</ReportPage>
</Report>
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs
+2
View File
@@ -676,6 +676,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
dt.Columns.Add("ProjectCode");
dt.Columns.Add("UnitName");
dt.Columns.Add("HotProessTrustCode");
dt.Columns.Add("ISO_DesignPress");
//DataView dv = tb.DefaultView;//获取表视图
//dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序
@@ -688,6 +689,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
newRows["ProjectCode"] = row["ProjectCode"].ToString();
newRows["UnitName"] = row["UnitName"].ToString();
newRows["HotProessTrustCode"] = row["HotProessTrustCode"].ToString();
newRows["ISO_DesignPress"] = row["ISO_DesignPress"].ToString();
dt.Rows.Add(newRows);
}
BLL.Common.FastReportService.AddFastreportTable(dt);
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -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/;"/>