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

20260421

This commit is contained in:
毕文静 2026-04-21 09:49:57 +08:00
parent 7bfd3a2928
commit 27388b5586
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
View File

@ -315,5 +315,16 @@ namespace BLL
select x.PipeLineLength).Sum(); select x.PipeLineLength).Sum();
return PipeLineLength; return PipeLineLength;
} }
public static string GetStrIsoNos(string projectId)
{
List<Model.HJGL_PW_IsoInfo> isoInfos = GetIsoInfoByProjectId(projectId);
string isoNos = string.Empty;
foreach (var iso in isoInfos)
{
isoNos += iso.ISO_IsoNo + ",";
}
return isoNos;
}
} }
} }

1
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -8270,7 +8270,6 @@
<Folder Include="App_Themes\Default\Images\" /> <Folder Include="App_Themes\Default\Images\" />
<Folder Include="common\ReportPrint\upload\" /> <Folder Include="common\ReportPrint\upload\" />
<Folder Include="File\Image\" /> <Folder Include="File\Image\" />
<Folder Include="HJGL\JoinMarking\" />
<Folder Include="SeetaFaceDir\modelimages\" /> <Folder Include="SeetaFaceDir\modelimages\" />
<Folder Include="tmpupload\" /> <Folder Include="tmpupload\" />
<Folder Include="WeldMat\res\js\vendor\" /> <Folder Include="WeldMat\res\js\vendor\" />

2
HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
View File

@ -163,7 +163,7 @@ namespace FineUIPro.Web.JGZL
/// </summary> /// </summary>
//private void BindGrid() //private void BindGrid()
//{ //{
// //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1");
// string strSql = @"SELECT * from JGZL_AcceptanceCertificate where 1=1"; // string strSql = @"SELECT * from JGZL_AcceptanceCertificate where 1=1";
// List<SqlParameter> listStr = new List<SqlParameter>(); // List<SqlParameter> listStr = new List<SqlParameter>();
// if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))

2
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.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" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList> <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px" EnableEdit="true"></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>

2
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" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList> <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px" EnableEdit="true"></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>

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

@ -310,6 +310,7 @@ namespace FineUIPro.Web.JGZL
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string isoNos = BLL.HJGL_PW_IsoInfoService.GetStrIsoNos(this.CurrUser.LoginProjectId);
string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem where 1=1"; string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem where 1=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.RecordId)) if (!string.IsNullOrEmpty(this.RecordId))
@ -317,6 +318,11 @@ namespace FineUIPro.Web.JGZL
strSql += " AND RecordId = @RecordId"; strSql += " AND RecordId = @RecordId";
listStr.Add(new SqlParameter("@RecordId", this.RecordId)); listStr.Add(new SqlParameter("@RecordId", this.RecordId));
} }
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
{
strSql += " AND CHARINDEX(PipelineNo,@isoNos)>0 ";
listStr.Add(new SqlParameter("@isoNos", isoNos));
}
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count; Grid1.RecordCount = tb.Rows.Count;
@ -736,6 +742,7 @@ namespace FineUIPro.Web.JGZL
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
BindGrid();
} }
else else
{ {