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

20260512 无损检测委托

This commit is contained in:
毕文静 2026-05-12 09:27:51 +08:00
parent 0686f516b6
commit 5f2cfadc3a
15 changed files with 390 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
HJGL_DS/BLL/DropListService.cs
View File

@ -600,6 +600,32 @@
return list; return list;
} }
public static ListItem[] HJGL_JOT_LocationItemG()
{
ListItem[] list = new ListItem[2];
list[0] = new ListItem("2G", "2G");
list[1] = new ListItem("5G", "5G");
return list;
}
public static ListItem[] HJGL_JOT_LocationItemH()
{
ListItem[] list = new ListItem[13];
list[0] = new ListItem("1G", "1G");
list[1] = new ListItem("3G", "3G");
list[2] = new ListItem("4G", "4G");
list[3] = new ListItem("6G", "6G");
list[4] = new ListItem("1F", "1F");
list[5] = new ListItem("2F", "2F");
list[6] = new ListItem("2FG", "2FG");
list[7] = new ListItem("2FR", "2FR");
list[8] = new ListItem("2FRG", "2FRG");
list[9] = new ListItem("4F", "4F");
list[10] = new ListItem("5F", "5F");
list[11] = new ListItem("5FG", "5FG");
list[12] = new ListItem("5FRG", "5FRG");
return list;
}
/// <summary> /// <summary>
/// 合格等级 /// 合格等级
/// </summary> /// </summary>

6
HJGL_DS/BLL/HJGL/WeldingManage/HJGL_WeldReportService.cs
View File

@ -340,6 +340,7 @@ namespace BLL
newWeldReportItem.JOT_JointAttribute = jotInfo.JOT_JointAttribute; newWeldReportItem.JOT_JointAttribute = jotInfo.JOT_JointAttribute;
var joty = BLL.HJGL_WeldService.GetJointTypeByID(jotInfo.JOTY_ID); var joty = BLL.HJGL_WeldService.GetJointTypeByID(jotInfo.JOTY_ID);
newWeldReportItem.JOTY_Group = joty.JOTY_Group;
if (jotInfo.JOT_JointAttribute == "固定") if (jotInfo.JOT_JointAttribute == "固定")
{ {
@ -347,6 +348,10 @@ namespace BLL
{ {
newWeldReportItem.JOT_Location = "5F"; newWeldReportItem.JOT_Location = "5F";
} }
else if(joty != null && joty.JOTY_Group == "1")
{
newWeldReportItem.JOT_Location = "2G";
}
else else
{ {
newWeldReportItem.JOT_Location = "5G"; newWeldReportItem.JOT_Location = "5G";
@ -363,7 +368,6 @@ namespace BLL
newWeldReportItem.JOT_Location = "1G"; newWeldReportItem.JOT_Location = "1G";
} }
} }
newWeldReportItem.JOT_Size = jotInfo.JOT_Size; newWeldReportItem.JOT_Size = jotInfo.JOT_Size;
newWeldReportItem.JOT_DoneDin = jotInfo.JOT_Size; newWeldReportItem.JOT_DoneDin = jotInfo.JOT_Size;
newWeldReportItem.JOT_Dia = jotInfo.JOT_Dia; newWeldReportItem.JOT_Dia = jotInfo.JOT_Dia;

2
HJGL_DS/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs
View File

@ -228,6 +228,7 @@ namespace FineUIPro.Web.ContinuousPrint
dt.Columns.Add("CH_NDTCriteria"); dt.Columns.Add("CH_NDTCriteria");
dt.Columns.Add("NDTR_Name"); dt.Columns.Add("NDTR_Name");
dt.Columns.Add("AcceptGrade"); dt.Columns.Add("AcceptGrade");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows = tbTitle.DefaultView.ToTable().Select(); DataRow[] rows = tbTitle.DefaultView.ToTable().Select();
foreach (var row in rows) foreach (var row in rows)
@ -298,6 +299,7 @@ namespace FineUIPro.Web.ContinuousPrint
{ {
newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString(); newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
} }
newRow["CH_TrustDate"] = row["RepairTrustDate"].ToString();
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);

2
HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs
View File

@ -229,6 +229,7 @@ namespace FineUIPro.Web.ContinuousPrint
dt.Columns.Add("NDT_Code"); dt.Columns.Add("NDT_Code");
dt.Columns.Add("AcceptGrade"); dt.Columns.Add("AcceptGrade");
dt.Columns.Add("CH_NDTCriteria"); dt.Columns.Add("CH_NDTCriteria");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows = tbTitle.DefaultView.ToTable().Select(); DataRow[] rows = tbTitle.DefaultView.ToTable().Select();
foreach (var row in rows) foreach (var row in rows)
@ -299,6 +300,7 @@ namespace FineUIPro.Web.ContinuousPrint
{ {
newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString(); newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
} }
newRow["CH_TrustDate"] = row["CH_TrustDate"].ToString();
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 14:22:21" ReportInfo.Modified="01/21/2026 15:27:04" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 14:22:21" ReportInfo.Modified="05/11/2026 11:10:00" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFTnSgiTjxVXJT4iSckTJclA=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFx3bd3T6Sb/EHw7Al2HDS3Q==">
<TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData"> <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="ProjectName" DataType="System.String" PropName="attach_image_id"/>
<Column Name="CheckUnit" DataType="System.String" PropName="image_series"/> <Column Name="CheckUnit" DataType="System.String" PropName="image_series"/>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2026 15:07:00" ReportInfo.Modified="01/21/2026 15:27:00" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2026 15:07:00" ReportInfo.Modified="05/11/2026 11:11:30" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFmcSFYofesUHrOPljnYNhvA=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFtZIMq3V8nt/0FuM8n67gKA==">
<TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData"> <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="ProjectName" DataType="System.String" PropName="attach_image_id"/>
<Column Name="InstallastionName" DataType="System.String" PropName="image_series"/> <Column Name="InstallastionName" DataType="System.String" PropName="image_series"/>
@ -56,6 +56,7 @@ namespace FastReport
<Column Name="CH_NDTCriteria" DataType="System.String" PropName="series_timestamp"/> <Column Name="CH_NDTCriteria" DataType="System.String" PropName="series_timestamp"/>
<Column Name="NDTR_Name" DataType="System.String" PropName="Column"/> <Column Name="NDTR_Name" DataType="System.String" PropName="Column"/>
<Column Name="AcceptGrade" DataType="System.String" PropName="Column"/> <Column Name="AcceptGrade" DataType="System.String" PropName="Column"/>
<Column Name="CH_TrustDate" DataType="System.String" PropName="Column"/>
</TableDataSource> </TableDataSource>
<TableDataSource Name="Data" DataType="System.Int32" PropName="AttachFile" Enabled="true" TableName="Data"> <TableDataSource Name="Data" DataType="System.Int32" PropName="AttachFile" Enabled="true" TableName="Data">
<Column Name="SortNum" DataType="System.String" PropName="AttachFileId"/> <Column Name="SortNum" DataType="System.String" PropName="AttachFileId"/>
@ -68,15 +69,15 @@ namespace FastReport
</TableDataSource> </TableDataSource>
</MsSqlDataConnection> </MsSqlDataConnection>
</Dictionary> </Dictionary>
<ReportPage Name="Page1" RawPaperSize="9" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" Guides="0,623.7,143.64,381.78,468.72,124.74,238.14,498.96,30.24,68.25,29.4,240.45,76.65,412.65,95.55,67.2,163.8,317.1,479.85,556.5,38.85,623.6,96.85,59.05,155.9,311.8,467.7,214.95,370.85,526.75"> <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" Guides="0,623.7,115.29,381.78,468.72,124.74,266.49,498.96,30.24,77.7,38.85,240.45,76.65,403.2,86.1,163.8,317.1,470.4,547.05,68.25,154.35,231,95.55,623.6,96.85,59.05,155.9,311.8,467.7,214.95,370.85,526.75">
<PageHeaderBand Name="PageHeader1" Width="623.7" Height="302.22" Guides="0,85.05,47.25,37.8,302.22,31.47,62.94,103.86,40.92,144.78,185.7,217.17"> <PageHeaderBand Name="PageHeader1" Width="623.7" Height="406.17" Guides="0,103.95,66.15,37.8,406.17,50.37,100.74,151.11,201.48,261.3,59.82,302.22,251.85,292.77">
<TableObject Name="Table1" Width="623.7" Height="85.05"> <TableObject Name="Table1" Width="623.7" Height="103.95" Border.Lines="All">
<TableColumn Name="Column1" Width="143.64"/> <TableColumn Name="Column1" Width="115.29"/>
<TableColumn Name="Column2" Width="238.14"/> <TableColumn Name="Column2" Width="266.49"/>
<TableColumn Name="Column3" Width="86.94"/> <TableColumn Name="Column3" Width="86.94"/>
<TableColumn Name="Column4" Width="30.24"/> <TableColumn Name="Column4" Width="30.24"/>
<TableColumn Name="Column5" Width="124.74"/> <TableColumn Name="Column5" Width="124.74"/>
<TableRow Name="Row1" Height="47.25"> <TableRow Name="Row1" Height="66.15">
<TableCell Name="Cell1" Border.Lines="All" Text="浙江石油化工&#13;&#10;有限公司" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/> <TableCell Name="Cell1" Border.Lines="All" Text="浙江石油化工&#13;&#10;有限公司" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
<TableCell Name="Cell2" Border.Lines="All" Text="管道焊缝检测委托单" HorzAlign="Center" VertAlign="Center" Font="宋体, 16pt, style=Bold" RowSpan="2"/> <TableCell Name="Cell2" Border.Lines="All" Text="管道焊缝检测委托单" HorzAlign="Center" VertAlign="Center" Font="宋体, 16pt, style=Bold" RowSpan="2"/>
<TableCell Name="Cell3" Border.Lines="Left, Top" Text="工程名称：" Font="宋体, 10.5pt"/> <TableCell Name="Cell3" Border.Lines="Left, Top" Text="工程名称：" Font="宋体, 10.5pt"/>
@ -91,17 +92,17 @@ namespace FastReport
<TableCell Name="Cell10" Border.Lines="Right, Bottom" Text="管道安装" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell10" Border.Lines="Right, Bottom" Text="管道安装" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
<TableObject Name="Table2" Top="85.05" Width="623.7" Height="217.17" Border.Lines="Left, Bottom"> <TableObject Name="Table2" Top="103.95" Width="623.7" Height="302.22" Border.Lines="All">
<TableColumn Name="Column6" Width="38.85"/> <TableColumn Name="Column6" Width="38.85"/>
<TableColumn Name="Column7" Width="29.4"/> <TableColumn Name="Column7" Width="38.85"/>
<TableColumn Name="Column8" Width="95.55"/> <TableColumn Name="Column8" Width="86.1"/>
<TableColumn Name="Column9" Width="76.65"/> <TableColumn Name="Column9" Width="76.65"/>
<TableColumn Name="Column10" Width="76.65"/> <TableColumn Name="Column10" Width="76.65"/>
<TableColumn Name="Column11" Width="95.55"/> <TableColumn Name="Column11" Width="86.1"/>
<TableColumn Name="Column12" Width="67.2"/> <TableColumn Name="Column12" Width="67.2"/>
<TableColumn Name="Column13" Width="76.65"/> <TableColumn Name="Column13" Width="76.65"/>
<TableColumn Name="Column14" Width="67.2"/> <TableColumn Name="Column14" Width="76.65"/>
<TableRow Name="Row3" Height="31.47"> <TableRow Name="Row3" Height="50.37">
<TableCell Name="Cell11" Border.Lines="All" Text="装置名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell11" Border.Lines="All" Text="装置名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell13" Border.Lines="All" Text="[MainData.InstallastionName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell13" Border.Lines="All" Text="[MainData.InstallastionName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
@ -112,7 +113,7 @@ namespace FastReport
<TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row4" Height="31.47"> <TableRow Name="Row4" Height="50.37">
<TableCell Name="Cell16" Border.Lines="All" Text="委托单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell16" Border.Lines="All" Text="委托单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell17" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell17" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell18" Border.Lines="All" Text="浙江石油化工有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell18" Border.Lines="All" Text="浙江石油化工有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
@ -123,7 +124,7 @@ namespace FastReport
<TableCell Name="Cell42" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell42" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell43" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell43" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row5" Height="40.92"> <TableRow Name="Row5" Height="50.37">
<TableCell Name="Cell21" Border.Lines="All" Text="承包商" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell21" Border.Lines="All" Text="承包商" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell22" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell22" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell23" Border.Lines="All" Text="鼎盛石化工程有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell23" Border.Lines="All" Text="鼎盛石化工程有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@ -134,7 +135,7 @@ namespace FastReport
<TableCell Name="Cell46" 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="[MainData.WME_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell47" Border.Lines="All" Text="[MainData.WME_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row6" Height="40.92"> <TableRow Name="Row6" Height="50.37">
<TableCell Name="Cell26" Border.Lines="All" Text="坡口形式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell26" Border.Lines="All" Text="坡口形式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell27" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell27" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell28" Border.Lines="All" Text="[MainData.JST_Name]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell28" Border.Lines="All" Text="[MainData.JST_Name]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@ -145,7 +146,7 @@ namespace FastReport
<TableCell Name="Cell50" Border.Lines="All" Text="检测方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell50" Border.Lines="All" Text="检测方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" Text="[MainData.NDT_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell51" Border.Lines="All" Text="[MainData.NDT_Code]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row7" Height="40.92"> <TableRow Name="Row7" Height="59.82">
<TableCell Name="Cell31" Border.Lines="All" Text="检测标准" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell31" Border.Lines="All" Text="检测标准" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell32" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell32" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell33" Border.Lines="All" Text="[MainData.CH_NDTCriteria]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell33" Border.Lines="All" Text="[MainData.CH_NDTCriteria]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@ -156,7 +157,7 @@ namespace FastReport
<TableCell Name="Cell54" Border.Lines="All" Text="合格级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell54" Border.Lines="All" Text="合格级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell55" Border.Lines="All" Text="[MainData.AcceptGrade]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell55" Border.Lines="All" Text="[MainData.AcceptGrade]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row8" Height="31.47"> <TableRow Name="Row8" Height="40.92">
<TableCell Name="Cell56" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell56" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell57" Border.Lines="All" Text="管线编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/> <TableCell Name="Cell57" Border.Lines="All" Text="管线编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
<TableCell Name="Cell58" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell58" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -169,18 +170,18 @@ namespace FastReport
</TableRow> </TableRow>
</TableObject> </TableObject>
</PageHeaderBand> </PageHeaderBand>
<DataBand Name="Data1" Top="306.22" Width="623.7" Height="31.47" Guides="0,31.47"> <DataBand Name="Data1" Top="410.17" Width="623.7" Height="40.92" Guides="0,40.92">
<TableObject Name="Table3" Width="623.7" Height="31.47" Border.Lines="Left, Bottom" ManualBuildEvent="Table3_ManualBuild"> <TableObject Name="Table3" Width="623.7" Height="40.92" Border.Lines="Left, Bottom" ManualBuildEvent="Table3_ManualBuild">
<TableColumn Name="Column15" Width="38.85"/> <TableColumn Name="Column15" Width="38.85"/>
<TableColumn Name="Column16" Width="29.4"/> <TableColumn Name="Column16" Width="29.4"/>
<TableColumn Name="Column17" Width="95.55"/> <TableColumn Name="Column17" Width="95.55"/>
<TableColumn Name="Column18" Width="76.65"/> <TableColumn Name="Column18" Width="76.65"/>
<TableColumn Name="Column19" Width="76.65"/> <TableColumn Name="Column19" Width="76.65"/>
<TableColumn Name="Column20" Width="95.55"/> <TableColumn Name="Column20" Width="86.1"/>
<TableColumn Name="Column21" Width="67.2"/> <TableColumn Name="Column21" Width="67.2"/>
<TableColumn Name="Column22" Width="76.65"/> <TableColumn Name="Column22" Width="76.65"/>
<TableColumn Name="Column23" Width="67.2"/> <TableColumn Name="Column23" Width="76.65"/>
<TableRow Name="Row14" Height="31.47"> <TableRow Name="Row14" Height="40.92">
<TableCell Name="Cell110" Border.Lines="All" Text="[Data.SortNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell110" Border.Lines="All" Text="[Data.SortNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell111" Border.Lines="All" Text="[Data.IsoNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/> <TableCell Name="Cell111" Border.Lines="All" Text="[Data.IsoNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
<TableCell Name="Cell112" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell112" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@ -193,19 +194,19 @@ namespace FastReport
</TableRow> </TableRow>
</TableObject> </TableObject>
</DataBand> </DataBand>
<ColumnFooterBand Name="ColumnFooter1" Top="377.16" Width="623.7"> <ColumnFooterBand Name="ColumnFooter1" Top="500.01" Width="623.7">
<ChildBand Name="Child1" Top="341.69" Width="623.7" Height="31.47" Guides="0,31.47" FillUnusedSpace="true"> <ChildBand Name="Child1" Top="455.09" Width="623.7" Height="40.92" Guides="0,40.92" FillUnusedSpace="true">
<TableObject Name="Table4" Width="623.7" Height="31.47" Border.Lines="Left, Bottom"> <TableObject Name="Table4" Width="623.7" Height="40.92" Border.Lines="Left, Bottom">
<TableColumn Name="Column24" Width="38.85"/> <TableColumn Name="Column24" Width="38.85"/>
<TableColumn Name="Column25" Width="29.4"/> <TableColumn Name="Column25" Width="29.4"/>
<TableColumn Name="Column26" Width="95.55"/> <TableColumn Name="Column26" Width="95.55"/>
<TableColumn Name="Column27" Width="76.65"/> <TableColumn Name="Column27" Width="76.65"/>
<TableColumn Name="Column28" Width="76.65"/> <TableColumn Name="Column28" Width="76.65"/>
<TableColumn Name="Column29" Width="95.55"/> <TableColumn Name="Column29" Width="86.1"/>
<TableColumn Name="Column30" Width="67.2"/> <TableColumn Name="Column30" Width="67.2"/>
<TableColumn Name="Column31" Width="76.65"/> <TableColumn Name="Column31" Width="76.65"/>
<TableColumn Name="Column32" Width="67.2"/> <TableColumn Name="Column32" Width="76.65"/>
<TableRow Name="Row15" Height="31.47"> <TableRow Name="Row15" Height="40.92">
<TableCell Name="Cell119" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell119" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell120" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/> <TableCell Name="Cell120" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
<TableCell Name="Cell121" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell121" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -219,8 +220,8 @@ namespace FastReport
</TableObject> </TableObject>
</ChildBand> </ChildBand>
</ColumnFooterBand> </ColumnFooterBand>
<PageFooterBand Name="PageFooter1" Top="381.16" Width="623.7" Height="161.6" Guides="0,161.6,37.8,68.04,30.24,101.12,33.08,131.36"> <PageFooterBand Name="PageFooter1" Top="504.01" Width="623.7" Height="233.42" Guides="0,233.42,62.37,102.06,39.69,154.04,51.98,193.73">
<TableObject Name="Table5" Width="623.6" Height="161.6" Border.Lines="All"> <TableObject Name="Table5" Width="623.6" Height="233.42" Border.Lines="All">
<TableColumn Name="Column33" Width="59.05"/> <TableColumn Name="Column33" Width="59.05"/>
<TableColumn Name="Column34" Width="96.85"/> <TableColumn Name="Column34" Width="96.85"/>
<TableColumn Name="Column35" Width="59.05"/> <TableColumn Name="Column35" Width="59.05"/>
@ -229,8 +230,8 @@ namespace FastReport
<TableColumn Name="Column38" Width="96.85"/> <TableColumn Name="Column38" Width="96.85"/>
<TableColumn Name="Column39" Width="59.05"/> <TableColumn Name="Column39" Width="59.05"/>
<TableColumn Name="Column40" Width="96.85"/> <TableColumn Name="Column40" Width="96.85"/>
<TableRow Name="Row16" Height="37.8"> <TableRow Name="Row16" Height="62.37">
<TableCell Name="Cell128" Border.Lines="All" Text="注：" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="8"/> <TableCell Name="Cell128" Border.Lines="All" Text="注：" Font="宋体, 10.5pt" ColSpan="8"/>
<TableCell Name="Cell129" Border.Lines="All"/> <TableCell Name="Cell129" Border.Lines="All"/>
<TableCell Name="Cell130" Border.Lines="All"/> <TableCell Name="Cell130" Border.Lines="All"/>
<TableCell Name="Cell131" Border.Lines="All"/> <TableCell Name="Cell131" Border.Lines="All"/>
@ -239,45 +240,45 @@ namespace FastReport
<TableCell Name="Cell154" Border.Lines="All"/> <TableCell Name="Cell154" Border.Lines="All"/>
<TableCell Name="Cell155" Border.Lines="All"/> <TableCell Name="Cell155" Border.Lines="All"/>
</TableRow> </TableRow>
<TableRow Name="Row17" Height="30.24"> <TableRow Name="Row17" Height="39.69">
<TableCell Name="Cell133" Border.Lines="Left, Right, Top" Text="承包商" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell133" Text="承包商" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell134" Border.Lines="Left, Right, Top" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell134" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell135" Border.Lines="Left, Right, Top" Text="监理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell135" Border.Lines="Left" Text="监理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell136" Border.Lines="Left, Right, Top" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell136" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell137" Border.Lines="Left, Right, Top" Text="项目部" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell137" Border.Lines="Left" Text="项目部" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell156" Border.Lines="Left, Right, Top" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell156" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell157" Border.Lines="Left, Right, Top" Text="检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell157" Border.Lines="Left" Text="检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell158" Border.Lines="Left, Right, Top" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell158" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row18" Height="33.08"> <TableRow Name="Row18" Height="51.98">
<TableCell Name="Cell138" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell138" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell139" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell139" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell140" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell140" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell141" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell141" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell142" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell142" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell159" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell159" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell160" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/> <TableCell Name="Cell160" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell161" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell161" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row19" Height="30.24"> <TableRow Name="Row19" Height="39.69">
<TableCell Name="Cell143" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell143" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell144" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell144" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell145" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell145" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell146" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell146" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell147" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell147" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell162" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell162" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell163" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell163" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell164" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell164" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row20" Height="30.24"> <TableRow Name="Row20" Height="39.69">
<TableCell Name="Cell148" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell148" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell149" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell149" Text="[MainData.CH_TrustDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell150" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell150" Border.Lines="Left" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell151" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell151" Text="[MainData.CH_TrustDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell152" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell152" Border.Lines="Left" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell165" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell165" Text="[MainData.CH_TrustDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell166" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell166" Border.Lines="Left" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell167" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell167" Text="[MainData.CH_TrustDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
</PageFooterBand> </PageFooterBand>

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

2
HJGL_DS/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs
View File

@ -720,6 +720,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
dt.Columns.Add("NDT_Code"); dt.Columns.Add("NDT_Code");
dt.Columns.Add("AcceptGrade"); dt.Columns.Add("AcceptGrade");
dt.Columns.Add("CH_NDTCriteria"); dt.Columns.Add("CH_NDTCriteria");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
foreach (var row in rows2) foreach (var row in rows2)
@ -748,6 +749,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
newRows["NDT_Code"] = row["NDT_Code"].ToString(); newRows["NDT_Code"] = row["NDT_Code"].ToString();
newRows["AcceptGrade"] = row["AcceptGrade"].ToString(); newRows["AcceptGrade"] = row["AcceptGrade"].ToString();
newRows["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString(); newRows["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
newRows["CH_TrustDate"] = row["RepairTrustDate"].ToString();
dt.Rows.Add(newRows); dt.Rows.Add(newRows);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);

2
HJGL_DS/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs
View File

@ -693,6 +693,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
dt.Columns.Add("NDT_Code"); dt.Columns.Add("NDT_Code");
dt.Columns.Add("AcceptGrade"); dt.Columns.Add("AcceptGrade");
dt.Columns.Add("CH_NDTCriteria"); dt.Columns.Add("CH_NDTCriteria");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
foreach (var row in rows2) foreach (var row in rows2)
@ -763,6 +764,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
{ {
newRows["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString(); newRows["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
} }
newRows["CH_TrustDate"] = row["CH_TrustDate"].ToString();
dt.Rows.Add(newRows); dt.Rows.Add(newRows);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);

32
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
View File

@ -188,7 +188,11 @@
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID" <f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID"
FieldType="String" Hidden="true"></f:RenderField> FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="JOTY_Group" ColumnID="JOTY_Group" DataField="JOTY_Group"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -222,6 +226,7 @@
function onGridAfterEdit(event, value, params) { function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId; var me = this, columnId = params.columnId, rowId = params.rowId;
me.updateCellValue(rowId, 'ChangeId', rowId); me.updateCellValue(rowId, 'ChangeId', rowId);
if (columnId === 'JOT_Dia') { if (columnId === 'JOT_Dia') {
var dia = me.getCellValue(rowId, 'JOT_Dia'); var dia = me.getCellValue(rowId, 'JOT_Dia');
@ -368,6 +373,31 @@
me.updateCellValue(rowId, 'JOT_DoneDin', doneDin); me.updateCellValue(rowId, 'JOT_DoneDin', doneDin);
} }
} }
if (columnId === 'JOT_JointAttribute') {
var attrValue = me.getCellValue(rowId, 'JOT_JointAttribute');
var attr_JotyGroup = me.getCellValue(rowId, 'JOTY_Group');
var editor = F('<%= drpLocation.ClientID %>');
if (editor) {
var data = [];
if (attr_JotyGroup == "1") {//对接焊缝
if (attrValue === "固定") {
data = ['2G', '5G'];
} else {
data = ['1G', '3G', '4G', '6G', '1F', '2F', '2FG', '2FR', '2FRG', '4F', '5F', '5FG', '5FRG'];
}
editor.loadData(data);
//默认选中第一个选项
if (data.length > 0) {
editor.setValue(data[0]);
me.updateCellValue(rowId, 'JOT_Location', data[0]);
} else {
editor.setValue("");
me.updateCellValue(rowId, 'JOT_Location', "");
}
}
}
}
} }
</script> </script>
</body> </body>

1
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Web.UI;
using BLL; using BLL;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;

6
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldReportEdit { public partial class WeldReportEdit
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -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="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"/> <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers> </httpHandlers>
<compilation debug="false" targetFramework="4.6.1"> <compilation debug="true" targetFramework="4.6.1">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies> </assemblies>

9
HJGL_DS/Model/HJGL/HJGL_SpRpWeldReportItem.cs
View File

@ -290,5 +290,14 @@ namespace Model
get; get;
set; set;
} }
/// <summary>
/// 焊缝类型
/// </summary>
public string JOTY_Group
{
get;
set;
}
} }
} }

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?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"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />