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

11

This commit is contained in:
李超 2026-05-13 20:29:27 +08:00
parent 7da7c8ee8d d68b257852
commit e8af354dc1
14 changed files with 394 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HJGL_DS/BLL/BLL.csproj
View File

@ -47,6 +47,10 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Release\BLL.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>

26
HJGL_DS/BLL/DropListService.cs
View File

@ -600,6 +600,32 @@
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>

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

@ -340,6 +340,7 @@ namespace BLL
newWeldReportItem.JOT_JointAttribute = jotInfo.JOT_JointAttribute;
var joty = BLL.HJGL_WeldService.GetJointTypeByID(jotInfo.JOTY_ID);
newWeldReportItem.JOTY_Group = joty.JOTY_Group;
if (jotInfo.JOT_JointAttribute == "固定")
{
@ -347,6 +348,10 @@ namespace BLL
{
newWeldReportItem.JOT_Location = "5F";
}
else if(joty != null && joty.JOTY_Group == "1")
{
newWeldReportItem.JOT_Location = "2G";
}
else
{
newWeldReportItem.JOT_Location = "5G";
@ -363,7 +368,6 @@ namespace BLL
newWeldReportItem.JOT_Location = "1G";
}
}
newWeldReportItem.JOT_Size = jotInfo.JOT_Size;
newWeldReportItem.JOT_DoneDin = jotInfo.JOT_Size;
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("NDTR_Name");
dt.Columns.Add("AcceptGrade");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows = tbTitle.DefaultView.ToTable().Select();
foreach (var row in rows)
@ -298,6 +299,7 @@ namespace FineUIPro.Web.ContinuousPrint
{
newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
}
newRow["CH_TrustDate"] = row["RepairTrustDate"].ToString();
dt.Rows.Add(newRow);
}
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("AcceptGrade");
dt.Columns.Add("CH_NDTCriteria");
dt.Columns.Add("CH_TrustDate");
DataRow[] rows = tbTitle.DefaultView.ToTable().Select();
foreach (var row in rows)
@ -299,6 +300,7 @@ namespace FineUIPro.Web.ContinuousPrint
{
newRow["CH_NDTCriteria"] = row["CH_NDTCriteria"].ToString();
}
newRow["CH_TrustDate"] = row["CH_TrustDate"].ToString();
dt.Rows.Add(newRow);
}
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"?>
<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;
using System.Collections;
using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
}
</ScriptText>
<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">
<Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
<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"?>
<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;
using System.Collections;
using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
}
</ScriptText>
<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">
<Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
<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="NDTR_Name" DataType="System.String" PropName="Column"/>
<Column Name="AcceptGrade" DataType="System.String" PropName="Column"/>
<Column Name="CH_TrustDate" 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"/>
@ -68,15 +69,15 @@ namespace FastReport
</TableDataSource>
</MsSqlDataConnection>
</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">
<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">
<TableObject Name="Table1" Width="623.7" Height="85.05">
<TableColumn Name="Column1" Width="143.64"/>
<TableColumn Name="Column2" Width="238.14"/>
<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="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="103.95" Border.Lines="All">
<TableColumn Name="Column1" Width="115.29"/>
<TableColumn Name="Column2" Width="266.49"/>
<TableColumn Name="Column3" Width="86.94"/>
<TableColumn Name="Column4" Width="30.24"/>
<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="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"/>
@ -91,17 +92,17 @@ namespace FastReport
<TableCell Name="Cell10" Border.Lines="Right, Bottom" Text="管道安装" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow>
</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="Column7" Width="29.4"/>
<TableColumn Name="Column8" Width="95.55"/>
<TableColumn Name="Column7" Width="38.85"/>
<TableColumn Name="Column8" Width="86.1"/>
<TableColumn Name="Column9" 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="Column13" Width="76.65"/>
<TableColumn Name="Column14" Width="67.2"/>
<TableRow Name="Row3" Height="31.47">
<TableColumn Name="Column14" Width="76.65"/>
<TableRow Name="Row3" Height="50.37">
<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="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="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</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="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"/>
@ -123,7 +124,7 @@ namespace FastReport
<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"/>
</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="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"/>
@ -134,7 +135,7 @@ namespace FastReport
<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"/>
</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="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"/>
@ -145,7 +146,7 @@ namespace FastReport
<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"/>
</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="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"/>
@ -156,7 +157,7 @@ namespace FastReport
<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"/>
</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="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"/>
@ -169,18 +170,18 @@ namespace FastReport
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="306.22" Width="623.7" Height="31.47" Guides="0,31.47">
<TableObject Name="Table3" Width="623.7" Height="31.47" Border.Lines="Left, Bottom" ManualBuildEvent="Table3_ManualBuild">
<DataBand Name="Data1" Top="410.17" Width="623.7" Height="40.92" Guides="0,40.92">
<TableObject Name="Table3" Width="623.7" Height="40.92" Border.Lines="Left, Bottom" ManualBuildEvent="Table3_ManualBuild">
<TableColumn Name="Column15" Width="38.85"/>
<TableColumn Name="Column16" Width="29.4"/>
<TableColumn Name="Column17" Width="95.55"/>
<TableColumn Name="Column18" 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="Column22" Width="76.65"/>
<TableColumn Name="Column23" Width="67.2"/>
<TableRow Name="Row14" Height="31.47">
<TableColumn Name="Column23" Width="76.65"/>
<TableRow Name="Row14" Height="40.92">
<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="Cell112" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@ -193,19 +194,19 @@ namespace FastReport
</TableRow>
</TableObject>
</DataBand>
<ColumnFooterBand Name="ColumnFooter1" Top="377.16" Width="623.7">
<ChildBand Name="Child1" Top="341.69" Width="623.7" Height="31.47" Guides="0,31.47" FillUnusedSpace="true">
<TableObject Name="Table4" Width="623.7" Height="31.47" Border.Lines="Left, Bottom">
<ColumnFooterBand Name="ColumnFooter1" Top="500.01" Width="623.7">
<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="40.92" Border.Lines="Left, Bottom">
<TableColumn Name="Column24" Width="38.85"/>
<TableColumn Name="Column25" Width="29.4"/>
<TableColumn Name="Column26" Width="95.55"/>
<TableColumn Name="Column27" 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="Column31" Width="76.65"/>
<TableColumn Name="Column32" Width="67.2"/>
<TableRow Name="Row15" Height="31.47">
<TableColumn Name="Column32" Width="76.65"/>
<TableRow Name="Row15" Height="40.92">
<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="Cell121" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -219,8 +220,8 @@ namespace FastReport
</TableObject>
</ChildBand>
</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">
<TableObject Name="Table5" Width="623.6" Height="161.6" Border.Lines="All">
<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="233.42" Border.Lines="All">
<TableColumn Name="Column33" Width="59.05"/>
<TableColumn Name="Column34" Width="96.85"/>
<TableColumn Name="Column35" Width="59.05"/>
@ -229,8 +230,8 @@ namespace FastReport
<TableColumn Name="Column38" Width="96.85"/>
<TableColumn Name="Column39" Width="59.05"/>
<TableColumn Name="Column40" Width="96.85"/>
<TableRow Name="Row16" Height="37.8">
<TableCell Name="Cell128" Border.Lines="All" Text="注：" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="8"/>
<TableRow Name="Row16" Height="62.37">
<TableCell Name="Cell128" Border.Lines="All" Text="注：" Font="宋体, 10.5pt" ColSpan="8"/>
<TableCell Name="Cell129" Border.Lines="All"/>
<TableCell Name="Cell130" Border.Lines="All"/>
<TableCell Name="Cell131" Border.Lines="All"/>
@ -239,45 +240,45 @@ namespace FastReport
<TableCell Name="Cell154" Border.Lines="All"/>
<TableCell Name="Cell155" Border.Lines="All"/>
</TableRow>
<TableRow Name="Row17" Height="30.24">
<TableCell Name="Cell133" Border.Lines="Left, Right, Top" 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="Cell135" Border.Lines="Left, Right, Top" 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="Cell137" Border.Lines="Left, Right, Top" 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="Cell157" Border.Lines="Left, Right, Top" 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"/>
<TableRow Name="Row17" Height="39.69">
<TableCell Name="Cell133" Text="承包商" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell134" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell135" Border.Lines="Left" Text="监理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell136" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell137" Border.Lines="Left" Text="项目部" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell156" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell157" Border.Lines="Left" Text="检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell158" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row18" Height="33.08">
<TableCell Name="Cell138" Border.Lines="Left, Right" 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="Cell140" Border.Lines="Left, Right" 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="Cell142" Border.Lines="Left, Right" 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="Cell160" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell161" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableRow Name="Row18" Height="51.98">
<TableCell Name="Cell138" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell139" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell140" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell141" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell142" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell159" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell160" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell161" Border.Lines="Left" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row19" Height="30.24">
<TableCell Name="Cell143" Border.Lines="Left" Text="签字：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell144" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableRow Name="Row19" Height="39.69">
<TableCell Name="Cell143" Text="签字：" 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="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="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="Cell164" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell164" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row20" Height="30.24">
<TableCell Name="Cell148" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell149" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell150" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell151" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell152" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell165" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell166" Border.Lines="Left, Bottom" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell167" Border.Lines="Right, Bottom" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableRow Name="Row20" Height="39.69">
<TableCell Name="Cell148" Text="日期：" 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" Text="日期：" 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" Text="日期：" 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" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell167" Text="[MainData.CH_TrustDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
</TableObject>
</PageFooterBand>

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

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

@ -7,208 +7,212 @@
<style type="text/css">
.customlabel span {
color: red;
font-weight: bold;
font-weight: bold;
}
</style>
<meta name="sourcefiles" content="~/HJGL/WeldingManage/WeldReportItemEdit.aspx" />
</style>
<meta name="sourcefiles" content="~/HJGL/WeldingManage/WeldReportItemEdit.aspx" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接日报"
TitleToolTip="焊接日报" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:HiddenField runat="server" ID="hdItemsString"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> </f:ToolbarFill>
<f:Button ID="btnSave" Text="提交" ToolTip="提交日报信息" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true"
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接日报"
TitleToolTip="焊接日报" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:HiddenField runat="server" ID="hdItemsString"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Text="提交" ToolTip="提交日报信息" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Width="100px"
ShowRedStar="true" Required="true" >
</f:DropDownList>
<f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="80px"
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Width="100px"
ShowRedStar="true" Required="true">
</f:DropDownList>
<f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="80px"
FocusOnPageLoad="true">
</f:DropDownList>
<f:TextBox ID="txtDailyReportNo" Label="日报告号" ShowRedStar="true" Required="true" runat="server" Readonly="true" LabelWidth="80px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCHT_Tabler" Label="制单人" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="80px">
</f:DropDownList>
<f:DatePicker ID="txtCHT_TableDate" Label="制单日期" runat="server" ShowRedStar="true" Required="true" LabelWidth="80px" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
<f:DatePicker ID="txtJOT_WeldDate" Label="焊接日期" runat="server" DateFormatString="yyyy-MM-dd" ShowRedStar="true" Required="true" LabelWidth="80px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtJOT_Remark" Label="备注" runat="server" LabelWidth="80px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="80px" Hidden="true"
CssClass="customlabel">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" EnableColumnLines="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="JOT_ID" AllowSorting="true"
SortField="ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="false" IsDatabasePaging="true" PageSize="10000"
EnableTextSelection="True" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnDelete" Text="删除行" ToolTip="删除数据" ConfirmText="确认删除选中行?" ConfirmTarget="Top"
Icon="Delete" runat="server" OnClick="btnMenuDelete_Click">
</f:Button>
<f:Button runat="server" ID="ckSelect" Text="查找" Icon="Find" OnClick="ckSelect_Click" ToolTip="查找所选项目和单位管线下的焊缝">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center"/>
<f:RenderField HeaderText="管线编号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="探伤比例" ColumnID="NDTR_Name" DataField="NDTR_Name" SortField="NDTR_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工*" ColumnID="JOT_CellWelderID" DataField="JOT_CellWelderCode" SortField="JOT_CellWelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpCellWelderCode" EnableEdit="true" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工*" ColumnID="JOT_FloorWelderID" DataField="JOT_FloorWelderCode" SortField="JOT_FloorWelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpFloorWelderCode" EnableEdit="true" Required="true" runat="server" ShowRedStar="true" >
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接区域*" ColumnID="WLO_CodeName" DataField="WLO_CodeName" SortField="WLO_CodeName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpCodeName" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊口属性*" ColumnID="JOT_JointAttribute" DataField="JOT_JointAttribute"
SortField="JOT_JointAttribute"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpJointAttribute" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接位置*" ColumnID="JOT_Location" DataField="JOT_Location" SortField="JOT_Location"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpLocation" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="实际寸径" ColumnID="JOT_Size" DataField="JOT_Size" SortField="JOT_Size"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="完成寸径*" ColumnID="JOT_DoneDin" DataField="JOT_DoneDin" SortField="JOT_DoneDin"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:NumberBox ID="txtDoneDin" NoDecimal="false" NoNegative="true" runat="server" ShowRedStar="true" Readonly="true">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="JOT_Dia" DataField="JOT_Dia" SortField="JOT_Dia"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
<Editor>
<f:NumberBox ID="txtDia" NoDecimal="false" NoNegative="true" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="JOT_Sch" DataField="JOT_Sch" SortField="JOT_Sch"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
<Editor>
<f:TextBox ID="txtSch" runat="server" >
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WME_ID" DataField="WME_Name" SortField="WME_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
<f:DropDownList ID="ddlWME_ID" EnableEdit="true" runat="server" >
</f:DropDownList>
</Editor>
</f:RenderField>
<f:TemplateField Width="100px" HeaderText="是否热处理" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊丝牌号" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldSilk" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊条牌号" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldMat" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID"
FieldType="String" Hidden="true"></f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="焊口查找页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
EnableResize="true" runat="server" CloseAction="HidePostBack" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="680px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
</f:DropDownList>
<f:TextBox ID="txtDailyReportNo" Label="日报告号" ShowRedStar="true" Required="true" runat="server" Readonly="true" LabelWidth="80px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCHT_Tabler" Label="制单人" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="80px">
</f:DropDownList>
<f:DatePicker ID="txtCHT_TableDate" Label="制单日期" runat="server" ShowRedStar="true" Required="true" LabelWidth="80px" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
<f:DatePicker ID="txtJOT_WeldDate" Label="焊接日期" runat="server" DateFormatString="yyyy-MM-dd" ShowRedStar="true" Required="true" LabelWidth="80px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtJOT_Remark" Label="备注" runat="server" LabelWidth="80px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="80px" Hidden="true"
CssClass="customlabel">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" EnableColumnLines="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="JOT_ID" AllowSorting="true"
SortField="ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="false" IsDatabasePaging="true" PageSize="10000"
EnableTextSelection="True" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnDelete" Text="删除行" ToolTip="删除数据" ConfirmText="确认删除选中行?" ConfirmTarget="Top"
Icon="Delete" runat="server" OnClick="btnMenuDelete_Click">
</f:Button>
<f:Button runat="server" ID="ckSelect" Text="查找" Icon="Find" OnClick="ckSelect_Click" ToolTip="查找所选项目和单位管线下的焊缝">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField HeaderText="管线编号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="探伤比例" ColumnID="NDTR_Name" DataField="NDTR_Name" SortField="NDTR_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工*" ColumnID="JOT_CellWelderID" DataField="JOT_CellWelderCode" SortField="JOT_CellWelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpCellWelderCode" EnableEdit="true" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工*" ColumnID="JOT_FloorWelderID" DataField="JOT_FloorWelderCode" SortField="JOT_FloorWelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpFloorWelderCode" EnableEdit="true" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接区域*" ColumnID="WLO_CodeName" DataField="WLO_CodeName" SortField="WLO_CodeName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpCodeName" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊口属性*" ColumnID="JOT_JointAttribute" DataField="JOT_JointAttribute"
SortField="JOT_JointAttribute"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpJointAttribute" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接位置*" ColumnID="JOT_Location" DataField="JOT_Location" SortField="JOT_Location"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:DropDownList ID="drpLocation" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="实际寸径" ColumnID="JOT_Size" DataField="JOT_Size" SortField="JOT_Size"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="完成寸径*" ColumnID="JOT_DoneDin" DataField="JOT_DoneDin" SortField="JOT_DoneDin"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:NumberBox ID="txtDoneDin" NoDecimal="false" NoNegative="true" runat="server" ShowRedStar="true" Readonly="true">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="JOT_Dia" DataField="JOT_Dia" SortField="JOT_Dia"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
<Editor>
<f:NumberBox ID="txtDia" NoDecimal="false" NoNegative="true" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="JOT_Sch" DataField="JOT_Sch" SortField="JOT_Sch"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
<Editor>
<f:TextBox ID="txtSch" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WME_ID" DataField="WME_Name" SortField="WME_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
<f:DropDownList ID="ddlWME_ID" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:TemplateField Width="100px" HeaderText="是否热处理" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊丝牌号" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldSilk" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊条牌号" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldMat" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="JOTY_Group" ColumnID="JOTY_Group" DataField="JOTY_Group"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="焊口查找页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
EnableResize="true" runat="server" CloseAction="HidePostBack" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="680px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
@ -222,6 +226,7 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
me.updateCellValue(rowId, 'ChangeId', rowId);
if (columnId === 'JOT_Dia') {
var dia = me.getCellValue(rowId, 'JOT_Dia');
@ -368,6 +373,31 @@
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>
</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.SqlClient;
using System.Linq;
using System.Web.UI;
using BLL;
using Newtonsoft.Json.Linq;

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

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
public partial class WeldReportEdit {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldReportEdit
{
/// <summary>
/// Head1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdItemsString 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdItemsString;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpProjectId 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// drpUnit 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// txtDailyReportNo 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDailyReportNo;
/// <summary>
/// drpCHT_Tabler 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCHT_Tabler;
/// <summary>
/// txtCHT_TableDate 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCHT_TableDate;
/// <summary>
/// txtJOT_WeldDate 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtJOT_WeldDate;
/// <summary>
/// txtJOT_Remark 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJOT_Remark;
/// <summary>
/// lbAmount 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbAmount;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ckSelect 控件。
/// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button ckSelect;
/// <summary>
/// drpCellWelderCode 控件。
/// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCellWelderCode;
/// <summary>
/// drpFloorWelderCode 控件。
/// </summary>
@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFloorWelderCode;
/// <summary>
/// drpCodeName 控件。
/// </summary>
@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCodeName;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// drpLocation 控件。
/// </summary>
@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpLocation;
/// <summary>
/// txtDoneDin 控件。
/// </summary>
@ -263,7 +265,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDoneDin;
/// <summary>
/// txtDia 控件。
/// </summary>
@ -272,7 +274,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDia;
/// <summary>
/// txtSch 控件。
/// </summary>
@ -281,7 +283,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSch;
/// <summary>
/// ddlWME_ID 控件。
/// </summary>
@ -290,7 +292,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWME_ID;
/// <summary>
/// Label8 控件。
/// </summary>
@ -299,7 +301,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label8;
/// <summary>
/// ddlWeldSilk 控件。
/// </summary>
@ -308,7 +310,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldSilk;
/// <summary>
/// ddlWeldMat 控件。
/// </summary>
@ -317,7 +319,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldMat;
/// <summary>
/// Window1 控件。
/// </summary>
@ -326,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -335,7 +337,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

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

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;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/;"/>
@ -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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1">
<compilation debug="false" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>
@ -163,218 +163,6 @@
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>

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

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