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

20260306 热处理委托打印

This commit is contained in:
毕文静 2026-03-06 16:19:28 +08:00
parent 2f562e57aa
commit 27aa4f2ffe
16 changed files with 846 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
DataBase/版本日志/HJGLDB_DS_2026-03-06_bwj.sql Normal file
View File

@ -0,0 +1,51 @@
ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem]
(
@HotProessTrustId nvarchar(50),
@ProessTypes nvarchar(50)=null
)
AS
--通过检测id获取委托单信息
BEGIN
SELECT
HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,Sort1,Sort2,Sort3,Sort4,Sort5,
STUFF(
(
SELECT '+' + CASE
WHEN t.ProessTypes = '1' THEN '预热'
WHEN t.ProessTypes = '2' THEN '消氢'
WHEN t.ProessTypes = '3' THEN '后热'
WHEN t.ProessTypes = '4' THEN '消应力热处理'
WHEN t.ProessTypes = '5' THEN '稳定化处理'
ELSE ''
END
FROM HJGL_View_CH_HotProessTrustItem t
WHERE
t.HotProessTrustId = TrustItem.HotProessTrustId
AND t.ISO_IsoNo = TrustItem.ISO_IsoNo
AND t.JOT_JointNo = TrustItem.JOT_JointNo
AND t.JOT_JointDesc = TrustItem.JOT_JointDesc
AND t.STE_Code = TrustItem.STE_Code
AND t.Sort1 = TrustItem.Sort1
AND t.Sort2 = TrustItem.Sort2
AND t.Sort3 = TrustItem.Sort3
AND t.Sort4 = TrustItem.Sort4
AND t.Sort5 = TrustItem.Sort5
ORDER BY t.ProessTypes -- 按 ProessTypes 排序拼接
FOR XML PATH(''), TYPE
).value('.', 'NVARCHAR(MAX)'),
1, 1, '' -- 去掉开头的 '+'
) AS ProessTypes
FROM HJGL_View_CH_HotProessTrustItem TrustItem
WHERE
HotProessTrustId=@HotProessTrustId
and (ProessTypes=@ProessTypes or @ProessTypes is null)
GROUP BY
HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,Sort1,Sort2,Sort3,Sort4,Sort5
union
select '99999999' as Number,'以下空白' AS ISO_IsoNo,null,null,null,null,null,null,null,null,null
ORDER BY ISO_IsoNo,JOT_JointNo,Sort1,Sort2,Sort3,Sort4,Sort5
end

8
HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordItemService.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Model; using Model;
using System.Linq; using System.Linq;
using System;
namespace BLL namespace BLL
@ -34,7 +35,7 @@ namespace BLL
public static List<Model.JGZL_PressureTestOfPipelineSystemRecordItem> GetItemByRecordId(string recordId) public static List<Model.JGZL_PressureTestOfPipelineSystemRecordItem> GetItemByRecordId(string recordId)
{ {
return Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem.Where(e => return Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem.Where(e =>
e.RecordId == recordId).ToList(); e.RecordId == recordId).OrderBy(e => e.PipelineNo).OrderBy(e => e.VoltageStabilizationTime).ToList();
} }
@ -111,5 +112,10 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
} }
public static List<Model.JGZL_PressureTestOfPipelineSystemRecordItem> GetPressureTestOfPipelineSystemRecordByPipeLine(string recordId, string iSO_IsoNo)
{
return (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem where x.RecordId == recordId && x.PipelineNo == iSO_IsoNo select x).ToList();
}
} }
} }

1
HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordService.cs
View File

@ -1,4 +1,5 @@
using Model; using Model;
using System;
using System.Linq; using System.Linq;

4
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道吹扫、清洗检验记录.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/15/2026 09:31:42" ReportInfo.Modified="02/23/2026 15:55:07" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="01/15/2026 09:31:42" ReportInfo.Modified="03/06/2026 10:37:51" 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+/QFuHhcqu8L4UWb4nfRxUHr2Q=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFQUCgHaVe8pg3uMCLTO4lkg==">
<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="SystemName" DataType="System.String" PropName="image_series"/> <Column Name="SystemName" DataType="System.String" PropName="image_series"/>

4
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.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/29/2026 10:23:50" ReportInfo.Modified="02/23/2026 09:11:07" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="01/29/2026 10:23:50" ReportInfo.Modified="03/06/2026 16:02:13" 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+/QFmsU4j1CDjBlyO5m7ygS6qQ=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFosjZ/ejXg9zfJILxJtNSOA==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data"> <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="PipelineNo" DataType="System.String" PropName="attach_image_id"/> <Column Name="PipelineNo" DataType="System.String" PropName="attach_image_id"/>
<Column Name="DesignPressure" DataType="System.String" PropName="image_series"/> <Column Name="DesignPressure" DataType="System.String" PropName="image_series"/>

6
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/21/2024 15:06:49" ReportInfo.Modified="09/25/2025 14:16:18" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="03/06/2026 14:56: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+/QFLsbctPP35IDspe10eEn2TQ=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFXRA52hHA2Zz6d5lLvCYfUA==">
<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="ProjectCode" DataType="System.String" PropName="image_series"/> <Column Name="ProjectCode" DataType="System.String" PropName="image_series"/>
@ -115,7 +115,7 @@ namespace FastReport
<TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell35" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell35" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell36" Border.Lines="All" Text="吴江市天宇工程技术服务有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/> <TableCell Name="Cell36" Border.Lines="All" Text="综合维修部" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
</TableRow> </TableRow>
<TableRow Name="Row7" Height="36.61"> <TableRow Name="Row7" Height="36.61">
<TableCell Name="Cell37" Border.Lines="All" Text="委托单编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/> <TableCell Name="Cell37" Border.Lines="All" Text="委托单编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>

13
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx
View File

@ -21,16 +21,23 @@
EnableCollapse="true" Width="320px" Title="热处理委托" ShowBorder="true" Layout="VBox" EnableCollapse="true" Width="320px" Title="热处理委托" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineNo" runat="server" EmptyText="输入查询条件" AutoPostBack="true"
Label="管线号" LabelWidth="60px" OnTextChanged="Tree_TextChanged" Width="300px">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtSearchNo" runat="server" EmptyText="输入查询条件" AutoPostBack="true" <f:TextBox ID="txtSearchNo" runat="server" EmptyText="输入查询条件" AutoPostBack="true"
Label="单号" LabelWidth="50px" OnTextChanged="Tree_TextChanged" Width="300px"> Label="单号" LabelWidth="60px" OnTextChanged="Tree_TextChanged" Width="300px">
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="300px" EnableMultiSelect="true" <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="60px" Width="300px" EnableMultiSelect="true"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged"> EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
</Items> </Items>
@ -114,7 +121,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="热处理委托" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="热处理委托" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="HotProessTrustItemId" AllowCellEditing="true" runat="server" BoxFlex="1" DataKeyNames="HotProessTrustItemId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HotProessTrustItemId" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HotProessTrustItemId"
AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5,ProessTypes" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" AutoScroll="true"> EnableTextSelection="True" AutoScroll="true">
<Toolbars> <Toolbars>

34
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs
View File

@ -178,6 +178,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
rootNode.Expanded = true; rootNode.Expanded = true;
rootNode.ToolTip = "红色表示施工号下存在未打印的热处理委托记录"; rootNode.ToolTip = "红色表示施工号下存在未打印的热处理委托记录";
rootNode.EnableClickEvent = true; rootNode.EnableClickEvent = true;
rootNode.EnableExpandEvent = true;
this.tvControlItem.Nodes.Add(rootNode); this.tvControlItem.Nodes.Add(rootNode);
List<Model.Base_Project> projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); List<Model.Base_Project> projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
if (this.drpProjectId.SelectedValueArray.Length > 1 || (this.drpProjectId.SelectedValueArray.Length == 1 && this.drpProjectId.SelectedValue != "null")) if (this.drpProjectId.SelectedValueArray.Length > 1 || (this.drpProjectId.SelectedValueArray.Length == 1 && this.drpProjectId.SelectedValue != "null"))
@ -237,6 +238,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
TreeNode tn = new TreeNode(); TreeNode tn = new TreeNode();
tn.NodeID = "temp"; tn.NodeID = "temp";
tn.Text = "正在加载..."; tn.Text = "正在加载...";
tn.EnableExpandEvent = true;
rootUnitNode.Nodes.Add(tn); rootUnitNode.Nodes.Add(tn);
} }
} }
@ -252,6 +254,35 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{ {
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
foreach (var item in trustList) foreach (var item in trustList)
{
if (!string.IsNullOrEmpty(this.txtPipelineNo.Text.Trim()))
{
TreeNode newNode = new TreeNode();
var isoNo = (from x in db.HJGL_PW_IsoInfo
join y in db.HJGL_PW_JointInfo on x.ISO_ID equals y.ISO_ID
join z in db.HJGL_CH_HotProessTrustItem on y.JOT_ID equals z.JOT_ID
where z.HotProessTrustId == item.HotProessTrustId
&& x.ISO_IsoNo.Contains(this.txtPipelineNo.Text.Trim())
select x.ISO_IsoNo).FirstOrDefault();
if (isoNo != null)
{
if (item.IsPrint == true)
{
newNode.Text = isoNo;
}
else
{
newNode.Text = "<font color='#FF7575'>" + isoNo + "</font>";
}
newNode.NodeID = item.HotProessTrustId;
newNode.ToolTip = item.HotProessTrustCode;
newNode.CommandName = "委托单号";
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
node.Nodes.Add(newNode);
}
}
else
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
var isoNo = (from x in db.HJGL_PW_IsoInfo var isoNo = (from x in db.HJGL_PW_IsoInfo
@ -274,6 +305,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
node.Nodes.Add(newNode); node.Nodes.Add(newNode);
} }
} }
}
#endregion #endregion
protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e) protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
@ -717,7 +749,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
dt2.Columns.Add("ProessTypes"); dt2.Columns.Add("ProessTypes");
DataView dv = tb2.DefaultView;//获取表视图 DataView dv = tb2.DefaultView;//获取表视图
dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 dv.Sort = "ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID倒序排序
tb2 = dv.ToTable();//转为表 tb2 = dv.ToTable();//转为表
DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
int i = 0; int i = 0;

24
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.HotProessManage { namespace FineUIPro.Web.HJGL.HotProessManage
{
public partial class HotProessTrust { public partial class HotProessTrust
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -48,6 +50,24 @@ namespace FineUIPro.Web.HJGL.HotProessManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelLeftRegion; protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar6;
/// <summary>
/// txtPipelineNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineNo;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>

2
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx
View File

@ -37,7 +37,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged"></f:DropDownList> <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button> <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>

237
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
View File

@ -90,25 +90,31 @@ namespace FineUIPro.Web.JGZL
this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.ProjectId = this.tvControlItem.SelectedNodeID; this.ProjectId = this.tvControlItem.SelectedNodeID;
var record = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(this.tvControlItem.SelectedNodeID);
if (record != null)
{
this.BlowingCleaningId = record.BlowingCleaningId;
this.txtSystemName.Text = record.SystemName;
this.txtSystemCode.Text = record.SystemCode;
}
//管线下拉选择
var isoLists = (from x in Funs.DB.JGZL_BlowingCleaningItem
where x.BlowingCleaningId == this.BlowingCleaningId
select x.ISO_Id).Distinct().ToList();
this.drpIsoNoS.Items.Clear(); this.drpIsoNoS.Items.Clear();
this.drpIsoNoS.DataTextField = "ISO_Id"; this.drpIsoNoS.DataTextField = "ISO_IsoNo";
this.drpIsoNoS.DataValueField = "ISO_Id"; this.drpIsoNoS.DataValueField = "ISO_IsoNo";
this.drpIsoNoS.DataSource = isoLists; this.drpIsoNoS.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
this.drpIsoNoS.DataBind(); this.drpIsoNoS.DataBind();
Funs.FineUIPleaseSelect(this.drpIsoNoS);
this.drpIsoNoS.SelectedIndex = 0; //var record = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(this.tvControlItem.SelectedNodeID);
//if (record != null)
//{
// this.BlowingCleaningId = record.BlowingCleaningId;
// this.txtSystemName.Text = record.SystemName;
// this.txtSystemCode.Text = record.SystemCode;
//}
////管线下拉选择
//var isoLists = (from x in Funs.DB.JGZL_BlowingCleaningItem
// where x.BlowingCleaningId == this.BlowingCleaningId
// select x.ISO_Id).Distinct().ToList();
//this.drpIsoNoS.Items.Clear();
//this.drpIsoNoS.DataTextField = "ISO_Id";
//this.drpIsoNoS.DataValueField = "ISO_Id";
//this.drpIsoNoS.DataSource = isoLists;
//this.drpIsoNoS.DataBind();
//Funs.FineUIPleaseSelect(this.drpIsoNoS);
//this.drpIsoNoS.SelectedIndex = 0;
DataIsoInfo(); DataIsoInfo();
} }
@ -117,42 +123,65 @@ namespace FineUIPro.Web.JGZL
private void DataIsoInfo() private void DataIsoInfo()
{ {
this.txtSystemCode.Text = "01"; this.txtSystemCode.Text = "01";
this.txtSystemName.Text = "材质"; string serName = string.Empty;
this.txtSystemName.Text = string.Empty;
this.drpCheckResult1.SelectedValue = "合格"; this.drpCheckResult1.SelectedValue = "合格";
this.drpCheckResult2.SelectedValue = "合格"; this.drpCheckResult2.SelectedValue = "合格";
this.drpCheckResult3.SelectedValue = "合格"; this.drpCheckResult3.SelectedValue = "合格";
this.drpCheckResult4.SelectedValue = "合格"; this.drpCheckResult4.SelectedValue = "合格";
itemLists.Clear(); itemLists.Clear();
if (!string.IsNullOrEmpty(this.ProjectId)) if (!string.IsNullOrEmpty(this.ProjectId))
{
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
{
List<string> serList = new List<string>();
foreach (var isoNo in this.drpIsoNoS.SelectedValueArray)
{
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, ProjectId);
if (iso != null)
{
if (!string.IsNullOrEmpty(iso.SER_ID))
{
serList.Add(BLL.HJGL_MediumService.GetServiceBySERID(iso.SER_ID).SER_Name);
}
}
}
if (serList.Count > 0)
{
foreach (var item in serList.Distinct())
{
serName += item + "、";
}
if (!string.IsNullOrEmpty(serName))
{
serName = serName.Substring(0, serName.LastIndexOf('、'));
}
}
this.txtSystemName.Text = serName;
var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
foreach (var item in isoInfos)
{ {
var record = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(this.ProjectId); var record = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(this.ProjectId);
if (record != null) if (record != null)
{ {
this.BlowingCleaningId = record.BlowingCleaningId; this.BlowingCleaningId = record.BlowingCleaningId;
this.txtSystemCode.Text = record.SystemCode; this.txtSystemCode.Text = record.SystemCode;
this.txtSystemName.Text = record.SystemName; //this.txtSystemName.Text = record.SystemName;
this.drpCheckResult1.SelectedValue = record.CheckReulst1; this.drpCheckResult1.SelectedValue = record.CheckReulst1;
this.drpCheckResult2.SelectedValue = record.CheckReulst2; this.drpCheckResult2.SelectedValue = record.CheckReulst2;
this.drpCheckResult3.SelectedValue = record.CheckReulst3; this.drpCheckResult3.SelectedValue = record.CheckReulst3;
this.drpCheckResult4.SelectedValue = record.CheckReulst4; this.drpCheckResult4.SelectedValue = record.CheckReulst4;
itemLists = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(this.BlowingCleaningId);
} if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
else
{ {
//var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId); if (this.drpIsoNoS.SelectedValueArray.Contains(item.ISO_IsoNo))
//if (pro != null)
//{
// this.txtProjectCode.Text = pro.ProjectCode;
// this.txtProjectName.Text = pro.ProjectName;
//}
}
var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
foreach (var item in isoInfos)
{ {
var teamWeldingInspectionItem = BLL.BlowingCleaningItemService.GetItemByIsoNo(this.ProjectId, item.ISO_IsoNo); var recordItem = BLL.BlowingCleaningItemService.GetItemByIsoNo(this.ProjectId, item.ISO_IsoNo);
if (teamWeldingInspectionItem != null) if (recordItem != null)
{ {
//itemLists.Add(teamWeldingInspectionItem); itemLists.Add(recordItem);
} }
else else
{ {
@ -166,11 +195,71 @@ namespace FineUIPro.Web.JGZL
itemLists.Add(newItem); itemLists.Add(newItem);
} }
} }
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
{
itemLists = itemLists.Where(e => e.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList(); ;
} }
} }
else
{
if (this.drpIsoNoS.SelectedValueArray.Contains(item.ISO_IsoNo))
{
Model.JGZL_BlowingCleaningItem newItem = new JGZL_BlowingCleaningItem();
newItem.BlowingCleaningItemId = SQLHelper.GetNewID(typeof(Model.JGZL_BlowingCleaningItem));
newItem.ISO_Id = item.ISO_IsoNo;
newItem.STE_ID = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
newItem.OperatingMedium = HJGL_MediumService.GetServiceBySERID(item.SER_ID).SER_Name;
newItem.ScrubbingMedium = "压缩空气";
newItem.CleaningMedium = "洁净水";
itemLists.Add(newItem);
}
}
}
}
//var record = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(this.ProjectId);
//if (record != null)
//{
// this.BlowingCleaningId = record.BlowingCleaningId;
// this.txtSystemCode.Text = record.SystemCode;
// this.txtSystemName.Text = record.SystemName;
// this.drpCheckResult1.SelectedValue = record.CheckReulst1;
// this.drpCheckResult2.SelectedValue = record.CheckReulst2;
// this.drpCheckResult3.SelectedValue = record.CheckReulst3;
// this.drpCheckResult4.SelectedValue = record.CheckReulst4;
// itemLists = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(this.BlowingCleaningId);
//}
//else
//{
// //var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId);
// //if (pro != null)
// //{
// // this.txtProjectCode.Text = pro.ProjectCode;
// // this.txtProjectName.Text = pro.ProjectName;
// //}
//}
//var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
//foreach (var item in isoInfos)
//{
// var teamWeldingInspectionItem = BLL.BlowingCleaningItemService.GetItemByIsoNo(this.ProjectId, item.ISO_IsoNo);
// if (teamWeldingInspectionItem != null)
// {
// //itemLists.Add(teamWeldingInspectionItem);
// }
// else
// {
// Model.JGZL_BlowingCleaningItem newItem = new JGZL_BlowingCleaningItem();
// newItem.BlowingCleaningItemId = SQLHelper.GetNewID(typeof(Model.JGZL_BlowingCleaningItem));
// newItem.ISO_Id = item.ISO_IsoNo;
// newItem.STE_ID = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
// newItem.OperatingMedium = HJGL_MediumService.GetServiceBySERID(item.SER_ID).SER_Name;
// newItem.ScrubbingMedium = "压缩空气";
// newItem.CleaningMedium = "洁净水";
// itemLists.Add(newItem);
// }
//}
//if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
//{
// itemLists = itemLists.Where(e => e.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList(); ;
//}
}
this.Grid1.DataSource = itemLists; this.Grid1.DataSource = itemLists;
this.Grid1.DataBind(); this.Grid1.DataBind();
} }
@ -351,8 +440,8 @@ namespace FineUIPro.Web.JGZL
var newRow = dt.NewRow(); var newRow = dt.NewRow();
newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName; newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName;
newRow["SystemName"] = report.SystemName; newRow["SystemName"] = this.txtSystemName.Text.Trim();
newRow["SystemCode"] = report.SystemCode; newRow["SystemCode"] = this.txtSystemCode.Text.Trim();
newRow["Results"] = report.Results; newRow["Results"] = report.Results;
string blowingCleaningDate = string.Format("{0:yyyy年MM月dd日}", report.BlowingCleaningDate); string blowingCleaningDate = string.Format("{0:yyyy年MM月dd日}", report.BlowingCleaningDate);
newRow["BlowingCleaningDate"] = blowingCleaningDate; newRow["BlowingCleaningDate"] = blowingCleaningDate;
@ -363,13 +452,13 @@ namespace FineUIPro.Web.JGZL
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
var itemList = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId); //var itemList = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId);
if (this.drpIsoNoS.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue)) //if (this.drpIsoNoS.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
{ //{
itemList = itemList.Where(x => x.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList(); // itemList = itemList.Where(x => x.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList();
} //}
if (itemList.Count > 0) //if (itemList.Count > 0)
{ //{
DataTable itemdt = new DataTable(); DataTable itemdt = new DataTable();
itemdt.TableName = "Data"; itemdt.TableName = "Data";
itemdt.Columns.Add("ISO_IsoNo"); itemdt.Columns.Add("ISO_IsoNo");
@ -378,18 +467,28 @@ namespace FineUIPro.Web.JGZL
itemdt.Columns.Add("ScrubbingMedium"); itemdt.Columns.Add("ScrubbingMedium");
itemdt.Columns.Add("CleaningMedium"); itemdt.Columns.Add("CleaningMedium");
foreach (var item in itemList) //foreach (var item in itemList)
//{
// var newRow2 = itemdt.NewRow();
// newRow2["ISO_IsoNo"] = item.ISO_Id;
// newRow2["STE_Code"] = item.STE_ID;
// newRow2["OperatingMedium"] = item.OperatingMedium;
// newRow2["ScrubbingMedium"] = item.ScrubbingMedium;
// newRow2["CleaningMedium"] = item.CleaningMedium;
// itemdt.Rows.Add(newRow2);
//}
for (int i = 0; i < Grid1.Rows.Count; i++)
{ {
var newRow2 = itemdt.NewRow(); var newRow2 = itemdt.NewRow();
newRow2["ISO_IsoNo"] = item.ISO_Id; newRow2["ISO_IsoNo"] = this.Grid1.Rows[i].Values[0].ToString();
newRow2["STE_Code"] = item.STE_ID; newRow2["STE_Code"] = this.Grid1.Rows[i].Values[1].ToString();
newRow2["OperatingMedium"] = item.OperatingMedium; newRow2["OperatingMedium"] = this.Grid1.Rows[i].Values[2].ToString();
newRow2["ScrubbingMedium"] = item.ScrubbingMedium; newRow2["ScrubbingMedium"] = this.Grid1.Rows[i].Values[3].ToString();
newRow2["CleaningMedium"] = item.CleaningMedium; newRow2["CleaningMedium"] = this.Grid1.Rows[i].Values[4].ToString();
itemdt.Rows.Add(newRow2); itemdt.Rows.Add(newRow2);
} }
BLL.Common.FastReportService.AddFastreportTable(itemdt); BLL.Common.FastReportService.AddFastreportTable(itemdt);
} //}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
//keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
@ -520,17 +619,17 @@ namespace FineUIPro.Web.JGZL
} }
saveItem(); saveItem();
//管线下拉选择 ////管线下拉选择
var isoLists = (from x in Funs.DB.JGZL_BlowingCleaningItem //var isoLists = (from x in Funs.DB.JGZL_BlowingCleaningItem
where x.BlowingCleaningId == this.BlowingCleaningId // where x.BlowingCleaningId == this.BlowingCleaningId
select x.ISO_Id).Distinct().ToList(); // select x.ISO_Id).Distinct().ToList();
this.drpIsoNoS.Items.Clear(); //this.drpIsoNoS.Items.Clear();
this.drpIsoNoS.DataTextField = "ISO_Id"; //this.drpIsoNoS.DataTextField = "ISO_Id";
this.drpIsoNoS.DataValueField = "ISO_Id"; //this.drpIsoNoS.DataValueField = "ISO_Id";
this.drpIsoNoS.DataSource = isoLists; //this.drpIsoNoS.DataSource = isoLists;
this.drpIsoNoS.DataBind(); //this.drpIsoNoS.DataBind();
Funs.FineUIPleaseSelect(this.drpIsoNoS); //Funs.FineUIPleaseSelect(this.drpIsoNoS);
this.drpIsoNoS.SelectedIndex = 0; //this.drpIsoNoS.SelectedIndex = 0;
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -544,13 +643,21 @@ namespace FineUIPro.Web.JGZL
void saveItem() void saveItem()
{ {
BLL.BlowingCleaningItemService.DeleteBlowingCleaningItemList(this.BlowingCleaningId); //BLL.BlowingCleaningItemService.DeleteBlowingCleaningItemList(this.BlowingCleaningId);
itemLists.Clear(); itemLists.Clear();
JArray teamGroupData = Grid1.GetMergedData(); JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
{ {
JObject values = teamGroupRow.Value<JObject>("values"); JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index"); int rowIndex = teamGroupRow.Value<int>("index");
//删除原有信息
var item = BLL.BlowingCleaningItemService.GetItemByIsoNo(this.ProjectId, values.Value<string>("ISO_Id"));
if (item != null)
{
Funs.DB.JGZL_BlowingCleaningItem.DeleteOnSubmit(item);
Funs.DB.SubmitChanges();
}
Model.JGZL_BlowingCleaningItem newDetail = new Model.JGZL_BlowingCleaningItem Model.JGZL_BlowingCleaningItem newDetail = new Model.JGZL_BlowingCleaningItem
{ {
BlowingCleaningItemId = values.Value<string>("BlowingCleaningItemId"), BlowingCleaningItemId = values.Value<string>("BlowingCleaningItemId"),

1
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx
View File

@ -37,6 +37,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button> <f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button>

43
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs
View File

@ -69,9 +69,16 @@ namespace FineUIPro.Web.JGZL
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{ {
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.ProjectId = this.drpProjectId.SelectedValue;
} }
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
this.drpIsoNoS.Items.Clear();
this.drpIsoNoS.DataTextField = "ISO_IsoNo";
this.drpIsoNoS.DataValueField = "ISO_IsoNo";
this.drpIsoNoS.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
this.drpIsoNoS.DataBind();
var record = BLL.PressureTestOfPipelineSystemConfirmationRecordService.GetPressureTestOfPipelineSystemConfirmationRecordByProjectId(this.drpProjectId.SelectedValue); var record = BLL.PressureTestOfPipelineSystemConfirmationRecordService.GetPressureTestOfPipelineSystemConfirmationRecordByProjectId(this.drpProjectId.SelectedValue);
if (record != null) if (record != null)
{ {
@ -104,7 +111,7 @@ namespace FineUIPro.Web.JGZL
private void InitData() private void InitData()
{ {
this.txtSystemCode.Text = "01"; this.txtSystemCode.Text = "01";
this.txtSystemName.Text = "材质"; this.txtSystemName.Text = string.Empty;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
itemLists.Clear(); itemLists.Clear();
this.ProjectId = this.tvControlItem.SelectedNodeID; this.ProjectId = this.tvControlItem.SelectedNodeID;
@ -401,8 +408,8 @@ namespace FineUIPro.Web.JGZL
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("SystemName", report.FirstOrDefault().SystemName); keyValuePairs.Add("SystemName", this.txtSystemName.Text.Trim());
keyValuePairs.Add("SystemCode", report.FirstOrDefault().SystemCode); keyValuePairs.Add("SystemCode", this.txtSystemCode.Text.Trim());
keyValuePairs.Add("CheckItem1", report.Where(x => x.CheckItem1 == "01").FirstOrDefault().CheckItem3); keyValuePairs.Add("CheckItem1", report.Where(x => x.CheckItem1 == "01").FirstOrDefault().CheckItem3);
keyValuePairs.Add("CheckItem2", report.Where(x => x.CheckItem1 == "02").FirstOrDefault().CheckItem3); keyValuePairs.Add("CheckItem2", report.Where(x => x.CheckItem1 == "02").FirstOrDefault().CheckItem3);
keyValuePairs.Add("CheckItem3", report.Where(x => x.CheckItem1 == "03").FirstOrDefault().CheckItem3); keyValuePairs.Add("CheckItem3", report.Where(x => x.CheckItem1 == "03").FirstOrDefault().CheckItem3);
@ -652,5 +659,35 @@ namespace FineUIPro.Web.JGZL
} }
} }
#endregion #endregion
protected void drpIsoNoS_SelectedIndexChanged(object sender, EventArgs e)
{
this.txtSystemName.Text.Trim();
string serName = string.Empty;
List<string> serList = new List<string>();
foreach (var isoNo in this.drpIsoNoS.SelectedValueArray)
{
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, ProjectId);
if (iso != null)
{
if (!string.IsNullOrEmpty(iso.SER_ID))
{
serList.Add(BLL.HJGL_MediumService.GetServiceBySERID(iso.SER_ID).SER_Name);
}
}
}
if (serList.Count > 0)
{
foreach (var item in serList.Distinct())
{
serName += item + "、";
}
if (!string.IsNullOrEmpty(serName))
{
serName = serName.Substring(0, serName.LastIndexOf('、'));
}
}
this.txtSystemName.Text = serName;
}
} }
} }

9
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.JGZL
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar2; protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpIsoNoS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsoNoS;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>

49
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx
View File

@ -37,7 +37,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged"></f:DropDownList> <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button> <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
@ -120,19 +120,9 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" Hidden="true"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" Hidden="true">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
<%--<PageItems> <Listeners>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</f:ToolbarSeparator> </Listeners>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10"/>
<f:ListItem Text="15" Value="15"/>
<f:ListItem Text="20" Value="20"/>
<f:ListItem Text="25" Value="25"/>
</f:DropDownList>
</PageItems>--%>
</f:Grid> </f:Grid>
</Items> </Items>
</f:Panel> </f:Panel>
@ -155,13 +145,38 @@
</f:MenuButton> </f:MenuButton>
</f:Menu>--%> </f:Menu>--%>
</form> </form>
<%--<script type="text/javascript"> <script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>'; <%--var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单 // 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) { function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY); F(menuID).show(); //showAt(event.pageX, event.pageY);
return false; return false;
}--%>
function onGridAfterEdit(event, value, params) {
var me = this;
var columnId = params.columnId;
var rowId = params.rowId;
// 处理 TestTemperature 列
if (columnId == 'TestTemperature') {
// 先移除已有单位（避免重复拼接），再添加单位
var pureValue = (value || '').toString().replace(/℃/g, '');
// 仅当值不为空时才添加单位
if (pureValue) {
me.updateCellValue(rowId, 'TestTemperature', pureValue + '℃');
} }
</script>--%> }
//处理 TestMediumTemperature 列
if (columnId == 'TestMediumTemperature') {
// 先移除已有单位（避免重复拼接），再添加单位
var pureValue = (value || '').toString().replace(/℃/g, '');
// 仅当值不为空时才添加单位
if (pureValue) {
me.updateCellValue(rowId, 'TestMediumTemperature', pureValue + '℃');
}
}
}
</script>
</body> </body>
</html> </html>

268
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
View File

@ -1,15 +1,17 @@
using BLL; using BLL;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.IO;
using Model;
using Newtonsoft.Json.Linq;
using FineUIPro.Web.HJGL.DataIn;
using FastReport; using FastReport;
using FastReport.Export.Dbf; using FastReport.Export.Dbf;
using FineUIPro.Web.HJGL.DataIn;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.ServiceModel.PeerResolvers;
using System.Text.RegularExpressions;
namespace FineUIPro.Web.JGZL namespace FineUIPro.Web.JGZL
{ {
@ -90,25 +92,25 @@ namespace FineUIPro.Web.JGZL
this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.ProjectId = this.tvControlItem.SelectedNodeID; this.ProjectId = this.tvControlItem.SelectedNodeID;
var record = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(this.tvControlItem.SelectedNodeID); //var record = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(this.tvControlItem.SelectedNodeID);
if (record != null) //if (record != null)
{ //{
this.RecordId = record.RecordId; // this.RecordId = record.RecordId;
this.txtSystemName.Text = record.SystemName; // this.txtSystemName.Text = record.SystemName;
this.txtSystemCode.Text = record.SystemCode; // this.txtSystemCode.Text = record.SystemCode;
} //}
//管线下拉选择 //管线下拉选择
var isoLists = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem //var isoLists = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem
where x.RecordId == this.RecordId // where x.RecordId == this.RecordId
select x.PipelineNo).Distinct().ToList(); // select x.PipelineNo).Distinct().ToList();
this.drpIsoNoS.Items.Clear(); this.drpIsoNoS.Items.Clear();
this.drpIsoNoS.DataTextField = "PipelineNo"; this.drpIsoNoS.DataTextField = "ISO_IsoNo";
this.drpIsoNoS.DataValueField = "PipelineNo"; this.drpIsoNoS.DataValueField = "ISO_IsoNo";
this.drpIsoNoS.DataSource = isoLists; this.drpIsoNoS.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
this.drpIsoNoS.DataBind(); this.drpIsoNoS.DataBind();
Funs.FineUIPleaseSelect(this.drpIsoNoS); //Funs.FineUIPleaseSelect(this.drpIsoNoS);
this.drpIsoNoS.SelectedIndex = 0; //this.drpIsoNoS.SelectedIndex = 0;
DataIsoInfo(); DataIsoInfo();
} }
@ -116,35 +118,56 @@ namespace FineUIPro.Web.JGZL
private void DataIsoInfo() private void DataIsoInfo()
{ {
this.txtSystemCode.Text = "01";
this.txtSystemName.Text = "材质";
itemLists.Clear(); itemLists.Clear();
this.txtSystemName.Text = string.Empty;
string serName = string.Empty;
this.txtSystemCode.Text = "01";
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
{
List<string> serList = new List<string>();
foreach (var isoNo in this.drpIsoNoS.SelectedValueArray)
{
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, ProjectId);
if (iso != null)
{
if (!string.IsNullOrEmpty(iso.SER_ID))
{
serList.Add(BLL.HJGL_MediumService.GetServiceBySERID(iso.SER_ID).SER_Name);
}
}
}
if (serList.Count > 0)
{
foreach (var item in serList.Distinct())
{
serName += item + "、";
}
if (!string.IsNullOrEmpty(serName))
{
serName = serName.Substring(0, serName.LastIndexOf('、'));
}
}
this.txtSystemName.Text = serName;
if (!string.IsNullOrEmpty(this.ProjectId)) if (!string.IsNullOrEmpty(this.ProjectId))
{
var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
foreach (var item in isoInfos)
{ {
var record = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(this.ProjectId); var record = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(this.ProjectId);
if (record != null) if (record != null)
{ {
this.RecordId = record.RecordId; this.RecordId = record.RecordId;
this.txtSystemCode.Text = record.SystemCode; if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
this.txtSystemName.Text = record.SystemName; {
itemLists = BLL.PressureTestOfPipelineSystemRecordItemService.GetItemByRecordId(this.RecordId); if (this.drpIsoNoS.SelectedValueArray.Contains(item.ISO_IsoNo))
{
var recordItems = BLL.PressureTestOfPipelineSystemRecordItemService.GetPressureTestOfPipelineSystemRecordByPipeLine(this.RecordId, item.ISO_IsoNo);
if (recordItems.Count > 0)
{
foreach (var recordItem in recordItems)
{
itemLists.Add(recordItem);
} }
else
{
//var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId);
//if (pro != null)
//{
// this.txtProjectCode.Text = pro.ProjectCode;
// this.txtProjectName.Text = pro.ProjectName;
//}
}
var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
foreach (var item in isoInfos)
{
var teamWeldingInspectionItem = BLL.PressureTestOfPipelineSystemRecordItemService.GetItemByIsoNo(this.ProjectId,item.ISO_IsoNo);
if (teamWeldingInspectionItem != null)
{
//itemLists.Add(teamWeldingInspectionItem);
} }
else else
{ {
@ -154,7 +177,7 @@ namespace FineUIPro.Web.JGZL
newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : ""; newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : ""; newItem.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem.TestMedium = "水"; newItem.TestMedium = "水";
newItem.TestPressure = item.ISO_TestPress.HasValue ? item.ISO_TestPress.Value.ToString(("0.##")) + "MPa" : ""; newItem.TestPressure = (item.ISO_DesignPress.Value * 1.5m).ToString("0.##") + "Mpa";
newItem.VoltageStabilizationTime = "10min"; newItem.VoltageStabilizationTime = "10min";
itemLists.Add(newItem); itemLists.Add(newItem);
@ -164,14 +187,48 @@ namespace FineUIPro.Web.JGZL
newItem2.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : ""; newItem2.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem2.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : ""; newItem2.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem2.TestMedium = "水"; newItem2.TestMedium = "水";
newItem2.TestPressure = item.ISO_TestPress.HasValue ? item.ISO_TestPress.Value.ToString("0.##") + "MPa" : ""; newItem2.TestPressure = newItem2.DesignPressure;
newItem2.VoltageStabilizationTime = "30min"; newItem2.VoltageStabilizationTime = "30min";
itemLists.Add(newItem2); itemLists.Add(newItem2);
} }
} }
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null) }
}
else
{ {
itemLists = itemLists.Where(e => e.PipelineNo.Contains(this.drpIsoNoS.SelectedValue)).ToList(); ; //var teamWeldingInspectionItem = BLL.PressureTestOfPipelineSystemRecordItemService.GetItemByIsoNo(this.ProjectId, item.ISO_IsoNo);
//if (teamWeldingInspectionItem != null)
//{
// //itemLists.Add(teamWeldingInspectionItem);
//}
//else
//{
if (this.drpIsoNoS.SelectedValueArray.Contains(item.ISO_IsoNo))
{
Model.JGZL_PressureTestOfPipelineSystemRecordItem newItem = new JGZL_PressureTestOfPipelineSystemRecordItem();
newItem.Id = SQLHelper.GetNewID(typeof(Model.JGZL_PressureTestOfPipelineSystemRecordItem));
newItem.PipelineNo = item.ISO_IsoNo;
newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem.TestMedium = "水";
newItem.TestPressure = (item.ISO_DesignPress.Value * 1.5m).ToString("0.##") + "Mpa";
newItem.VoltageStabilizationTime = "10min";
itemLists.Add(newItem);
Model.JGZL_PressureTestOfPipelineSystemRecordItem newItem2 = new JGZL_PressureTestOfPipelineSystemRecordItem();
newItem2.Id = SQLHelper.GetNewID(typeof(Model.JGZL_PressureTestOfPipelineSystemRecordItem));
newItem2.PipelineNo = item.ISO_IsoNo;
newItem2.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem2.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem2.TestMedium = "水";
newItem2.TestPressure = newItem2.DesignPressure;
newItem2.VoltageStabilizationTime = "30min";
itemLists.Add(newItem2);
//}
}
}
}
itemLists.OrderBy(e => e.PipelineNo).OrderBy(e => e.VoltageStabilizationTime);
} }
} }
this.Grid1.DataSource = itemLists; this.Grid1.DataSource = itemLists;
@ -349,20 +406,20 @@ namespace FineUIPro.Web.JGZL
string rootPath = Server.MapPath("~/"); string rootPath = Server.MapPath("~/");
BLL.Common.FastReportService.ResetData(); BLL.Common.FastReportService.ResetData();
var report = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(projectId); //var report = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordByProjectId(projectId);
if (report != null) //if (report != null)
{ //{
string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem m left join JGZL_PressureTestOfPipelineSystemRecord d on d.RecordId = m.RecordId where d.ProjectId=@projectId "; //string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem m left join JGZL_PressureTestOfPipelineSystemRecord d on d.RecordId = m.RecordId where d.ProjectId=@projectId ";
List<SqlParameter> listStr = new List<SqlParameter>(); //List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", projectId)); //listStr.Add(new SqlParameter("@projectId", projectId));
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null) //if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
{ //{
strSql += " and PipelineNo like @isoNo"; // strSql += " and PipelineNo like @isoNo";
listStr.Add(new SqlParameter("@isoNo", "%" + this.drpIsoNoS.SelectedValue + "%")); // listStr.Add(new SqlParameter("@isoNo", "%" + this.drpIsoNoS.SelectedValue + "%"));
} //}
strSql += " order by PipelineNo,VoltageStabilizationTime asc"; //strSql += " order by PipelineNo,VoltageStabilizationTime asc";
SqlParameter[] parameter = listStr.ToArray(); //SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.TableName = "Data"; dt.TableName = "Data";
@ -375,29 +432,42 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("TestPressure"); dt.Columns.Add("TestPressure");
dt.Columns.Add("VoltageStabilizationTime"); dt.Columns.Add("VoltageStabilizationTime");
DataRow[] rows = tb.DefaultView.ToTable().Select(); //DataRow[] rows = tb.DefaultView.ToTable().Select();
foreach (var row in rows) for (int i = 0; i < Grid1.Rows.Count; i++)
{ {
var newRow = dt.NewRow(); var newRow = dt.NewRow();
newRow["PipelineNo"] = row["PipelineNo"].ToString(); newRow["PipelineNo"] = this.Grid1.Rows[i].Values[1].ToString();
newRow["DesignPressure"] = row["DesignPressure"].ToString(); newRow["DesignPressure"] = this.Grid1.Rows[i].Values[2].ToString();
newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); newRow["DesignTemperature"] = this.Grid1.Rows[i].Values[3].ToString();
newRow["TestTemperature"] = row["TestTemperature"].ToString(); newRow["TestTemperature"] = this.Grid1.Rows[i].Values[4].ToString();
newRow["TestMedium"] = row["TestMedium"].ToString(); newRow["TestMedium"] = this.Grid1.Rows[i].Values[5].ToString();
newRow["TestMediumTemperature"] = row["TestMediumTemperature"].ToString(); newRow["TestMediumTemperature"] = this.Grid1.Rows[i].Values[6].ToString();
newRow["TestPressure"] = row["TestPressure"].ToString(); newRow["TestPressure"] = this.Grid1.Rows[i].Values[7].ToString();
newRow["VoltageStabilizationTime"] = row["VoltageStabilizationTime"].ToString(); newRow["VoltageStabilizationTime"] = this.Grid1.Rows[i].Values[8].ToString();
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
} }
//foreach (var row in rows)
//{
//var newRow = dt.NewRow();
//newRow["PipelineNo"] = row["PipelineNo"].ToString();
//newRow["DesignPressure"] = row["DesignPressure"].ToString();
//newRow["DesignTemperature"] = row["DesignTemperature"].ToString();
//newRow["TestTemperature"] = row["TestTemperature"].ToString();
//newRow["TestMedium"] = row["TestMedium"].ToString();
//newRow["TestMediumTemperature"] = row["TestMediumTemperature"].ToString();
//newRow["TestPressure"] = row["TestPressure"].ToString();
//newRow["VoltageStabilizationTime"] = row["VoltageStabilizationTime"].ToString();
//dt.Rows.Add(newRow);
//}
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("SystemName", report.SystemName); keyValuePairs.Add("SystemName", this.txtSystemName.Text.Trim());
keyValuePairs.Add("SystemCode", report.SystemCode); keyValuePairs.Add("SystemCode", this.txtSystemCode.Text.Trim());
keyValuePairs.Add("TestConclusion", report.TestConclusion); //keyValuePairs.Add("TestConclusion", report.TestConclusion);
keyValuePairs.Add("Remark", report.Remark); //keyValuePairs.Add("Remark", report.Remark);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx";
@ -405,12 +475,12 @@ namespace FineUIPro.Web.JGZL
{ {
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
} }
} //}
else //else
{ //{
Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); // Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
return; // return;
} //}
} }
else else
{ {
@ -653,16 +723,16 @@ namespace FineUIPro.Web.JGZL
saveItem(); saveItem();
//管线下拉选择 //管线下拉选择
var isoLists = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem //var isoLists = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem
where x.RecordId == this.RecordId // where x.RecordId == this.RecordId
select x.PipelineNo).Distinct().ToList(); // select x.PipelineNo).Distinct().ToList();
this.drpIsoNoS.Items.Clear(); //this.drpIsoNoS.Items.Clear();
this.drpIsoNoS.DataTextField = "PipelineNo"; //this.drpIsoNoS.DataTextField = "PipelineNo";
this.drpIsoNoS.DataValueField = "PipelineNo"; //this.drpIsoNoS.DataValueField = "PipelineNo";
this.drpIsoNoS.DataSource = isoLists; //this.drpIsoNoS.DataSource = isoLists;
this.drpIsoNoS.DataBind(); //this.drpIsoNoS.DataBind();
Funs.FineUIPleaseSelect(this.drpIsoNoS); //Funs.FineUIPleaseSelect(this.drpIsoNoS);
this.drpIsoNoS.SelectedIndex = 0; //this.drpIsoNoS.SelectedIndex = 0;
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -676,13 +746,22 @@ namespace FineUIPro.Web.JGZL
void saveItem() void saveItem()
{ {
BLL.PressureTestOfPipelineSystemRecordItemService.DeleteItemByRecordId(this.RecordId); //BLL.PressureTestOfPipelineSystemRecordItemService.DeleteItemByRecordId(this.RecordId);
itemLists.Clear(); itemLists.Clear();
JArray teamGroupData = Grid1.GetMergedData(); JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
{ {
JObject values = teamGroupRow.Value<JObject>("values"); JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index"); int rowIndex = teamGroupRow.Value<int>("index");
//删除原有信息
var item = BLL.PressureTestOfPipelineSystemRecordItemService.GetPressureTestOfPipelineSystemRecordByPipeLine(this.RecordId, values.Value<string>("PipelineNo"));
if (item.Count > 0)
{
Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem.DeleteAllOnSubmit(item);
Funs.DB.SubmitChanges();
}
Model.JGZL_PressureTestOfPipelineSystemRecordItem newDetail = new Model.JGZL_PressureTestOfPipelineSystemRecordItem Model.JGZL_PressureTestOfPipelineSystemRecordItem newDetail = new Model.JGZL_PressureTestOfPipelineSystemRecordItem
{ {
Id = values.Value<string>("Id"), Id = values.Value<string>("Id"),
@ -717,5 +796,6 @@ namespace FineUIPro.Web.JGZL
{ {
DataIsoInfo(); DataIsoInfo();
} }
} }
} }