lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
李超
2026-05-30 10:09:22 +08:00
parent d0fcabe103
commit 7b944d66c5
9 changed files with 158 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognition.aspx.cs
+1 -2
View File
@@ -3,8 +3,7 @@
using BLL; using BLL;
using BLL.Common; using BLL.Common;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using Spire.Pdf;
using Spire.Pdf.Utilities;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs
+26 -23
View File
@@ -370,29 +370,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dtOther.Rows.Add(row); dtOther.Rows.Add(row);
} }
// 遍历并提取数据
foreach (JObject item in jArray)
{
var row = dt.NewRow();
row["id"] = item.Value<string>("id");
row["pipe_no"] = item.Value<string>("pipe_no");
row["drawing_number"] = item.Value<string>("drawing_number");
row["code"] = item.Value<string>("code");
row["seq_no"] = item.Value<string>("seq_no");
row["category"] = item.Value<string>("category");
row["description"] = item.Value<string>("description");
row["spec"] = item.Value<string>("spec");
row["qty"] = item.Value<string>("qty");
row["page_no"] = item.Value<string>("page_no");
row["remark"] = item.Value<string>("remark");
if (string.IsNullOrEmpty(row["drawing_number"].ToString()))
{
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
row["drawing_number"] = rowOther["text"];
}
dt.Rows.Add(row);
}
foreach (JObject item in jArrayIsoInfo) foreach (JObject item in jArrayIsoInfo)
@@ -417,6 +395,31 @@ namespace FineUIPro.Web.HJGL.DataIn
row["radiographic_examination"] = item.Value<string>("radiographic_examination"); row["radiographic_examination"] = item.Value<string>("radiographic_examination");
dtIsoInfo.Rows.Add(row); dtIsoInfo.Rows.Add(row);
} }
// 遍历并提取数据
foreach (JObject item in jArray)
{
var row = dt.NewRow();
row["id"] = item.Value<string>("id");
row["pipe_no"] = item.Value<string>("pipe_no");
row["drawing_number"] = item.Value<string>("drawing_number");
row["code"] = item.Value<string>("code");
row["seq_no"] = item.Value<string>("seq_no");
row["category"] = item.Value<string>("category");
row["description"] = item.Value<string>("description");
row["spec"] = item.Value<string>("spec");
row["qty"] = item.Value<string>("qty");
row["page_no"] = item.Value<string>("page_no");
row["remark"] = item.Value<string>("remark");
if (string.IsNullOrEmpty(row["drawing_number"].ToString()))
{
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
row["drawing_number"] = rowOther["text"];
}
dt.Rows.Add(row);
}
BindGrid(); BindGrid();
} }
} }
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx
+37 -17
View File
@@ -48,84 +48,104 @@
</f:TextBox>--%> </f:TextBox>--%>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList runat="server" ID="drpUnitWork" Label ="单位工程"></f:DropDownList>
<f:TextBox ID="txtSingleName" Label="图纸名称" <f:TextBox ID="txtSingleName" Label="图纸名称"
runat="server" LabelWidth="120px"> runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtSingleNumber" Label="单线图号" runat="server"
LabelWidth="140px">
</f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtSingleNumber" Label="单线图号" runat="server" LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpMedium" Label="介质名称" runat="server" <f:DropDownList ID="drpMedium" Label="介质名称" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"> ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpPipingClass" Label="管道等级" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="140px" >
</f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpPipingClass" Label="管道等级" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="140px" >
</f:DropDownList>
<f:DropDownList ID="drpDetectionRate" Label="探伤比例" runat="server" <f:DropDownList ID="drpDetectionRate" Label="探伤比例" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"> ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpDetectionType" Label="探伤类型" runat="server" EnableCheckBoxSelect="true" EnableMultiSelect="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="140px" AutoSelectFirstItem="false">
</f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpDetectionType" Label="探伤类型" runat="server" EnableCheckBoxSelect="true" EnableMultiSelect="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="140px" AutoSelectFirstItem="false">
</f:DropDownList>
<f:TextBox ID="numDesignTemperature" Label="设计温度℃" runat="server" LabelWidth="120px"></f:TextBox> <f:TextBox ID="numDesignTemperature" Label="设计温度℃" runat="server" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="numDesignPress" Label="设计压力 MPa(g)" runat="server" LabelWidth="140px">
</f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="numDesignPress" Label="设计压力 MPa(g)" runat="server" LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpTestMedium" Label="压力试验介质" runat="server" <f:DropDownList ID="drpTestMedium" Label="压力试验介质" runat="server"
EnableEdit="true" LabelWidth="120px"> EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="numTestPressure" Label="压力试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="numTestPressure" Label="压力试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpPressurePipingClass" Label="压力管道级别" runat="server" <f:DropDownList ID="drpPressurePipingClass" Label="压力管道级别" runat="server"
EnableEdit="true" LabelWidth="120px"> EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:NumberBox ID="numPipeLenth" Label="管线长度(m)" runat="server" LabelWidth="140px"></f:NumberBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:NumberBox ID="numPipeLenth" Label="管线长度(m)" runat="server" LabelWidth="140px"></f:NumberBox>
<f:DropDownList ID="drpLeakMedium" Label="泄露试验介质" runat="server" <f:DropDownList ID="drpLeakMedium" Label="泄露试验介质" runat="server"
EnableEdit="true" LabelWidth="120px"> EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="numLeakPressure" Label="泄露试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="numLeakPressure" Label="泄露试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpPCMedium" Label="吹洗要求" runat="server" <f:DropDownList ID="drpPCMedium" Label="吹洗要求" runat="server"
EnableEdit="true" LabelWidth="120px"> EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="numVacuumPressure" Label="真空试验压力 KPa(a)" runat="server" LabelWidth="140px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="numVacuumPressure" Label="真空试验压力 KPa(a)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpMaterial" Label="材质" <f:DropDownList ID="drpMaterial" Label="材质"
runat="server" EnableEdit="true" LabelWidth="120px" LabelAlign="Right"> runat="server" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="140px">
</f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="140px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox> <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.cs
+36 -32
View File
@@ -94,6 +94,7 @@ namespace FineUIPro.Web.HJGL.DataIn
Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true); Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true);
Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-"); Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-");
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1 BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId); Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId);
if (pressUnit != null && pressUnit.SetValue == "2") if (pressUnit != null && pressUnit.SetValue == "2")
@@ -186,19 +187,13 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
drpMaterial.SelectedValue = pipeline.MaterialId; drpMaterial.SelectedValue = pipeline.MaterialId;
} }
} if (!string.IsNullOrEmpty(pipeline.UnitWorkId))
else
{
this.UnitWorkId = Request.Params["UnitWorkId"];
Model.WBS_UnitWork workArea = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, workArea.UnitId, false);//单位
if (workArea != null)
{ {
this.ProjectId = workArea.ProjectId; drpUnitWork.SelectedValue = pipeline.UnitWorkId;
//this.InstallationId = workArea.InstallationId;
} }
} }
} }
} }
#endregion #endregion
@@ -223,7 +218,6 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
SaveData(true); SaveData(true);
// 关闭本窗体，然后回发父窗体 // 关闭本窗体，然后回发父窗体
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
} }
} }
@@ -242,34 +236,44 @@ namespace FineUIPro.Web.HJGL.DataIn
pipeline.UnitId = drpUnit.SelectedValue; pipeline.UnitId = drpUnit.SelectedValue;
pipeline.UnitWorkId = this.UnitWorkId; pipeline.UnitWorkId = this.UnitWorkId;
pipeline.PipelineCode = this.txtPipelineCode.Text.Trim(); pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
if (this.drpDetectionRate.SelectedValue != BLL.Const._Null) //if (this.drpDetectionRate.SelectedValue != BLL.Const._Null)
{ //{
pipeline.DetectionRateId = this.drpDetectionRate.SelectedValue; // pipeline.DetectionRateId = this.drpDetectionRate.SelectedValue;
} //}
else //else
{ //{
Alert.ShowInTop("请选择探伤比例！"); // Alert.ShowInTop("请选择探伤比例！");
return; // return;
} //}
if (this.drpMedium.SelectedValue != BLL.Const._Null) //if (this.drpMedium.SelectedValue != BLL.Const._Null)
//{
// pipeline.MediumId = this.drpMedium.SelectedValue;
//}
//else
//{
// Alert.ShowInTop("请选择介质！");
// return;
//}
if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
{ {
pipeline.MediumId = this.drpMedium.SelectedValue; pipeline.UnitWorkId = this.drpUnitWork.SelectedValue;
} }
else else
{ {
Alert.ShowInTop("请选择介质！"); Alert.ShowInTop("请选择单位工程！");
return;
}
if (this.drpPipingClass.SelectedValue != BLL.Const._Null)
{
pipeline.PipingClassId = this.drpPipingClass.SelectedValue;
}
else
{
Alert.ShowInTop("请选择管线等级！");
return; return;
} }
//if (this.drpPipingClass.SelectedValue != BLL.Const._Null)
//{
// pipeline.PipingClassId = this.drpPipingClass.SelectedValue;
//}
//else
//{
// Alert.ShowInTop("请选择管线等级！");
// return;
//}
if (this.drpTestMedium.SelectedValue != BLL.Const._Null) if (this.drpTestMedium.SelectedValue != BLL.Const._Null)
{ {
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.designer.cs
Generated
+9
View File
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.HJGL.DataIn
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
/// <summary> /// <summary>
/// txtSingleName 控件。 /// txtSingleName 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+8
View File
@@ -76,6 +76,9 @@
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表" <f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
EnablePostBack="true" OnClick="btnGetChart_Click" runat="server"> EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
</f:Button> </f:Button>
<f:Button ID="btnJoinMarke" ToolTip="ISO轴测图标注" Icon="PageRed" Text="ISO轴测图标注"
EnablePostBack="true" OnClick="btnJoinMarke_Click" runat="server">
</f:Button>
<f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图" <f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server"> EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
</f:Button> </f:Button>
@@ -213,6 +216,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
<PageItems> <PageItems>
@@ -246,6 +250,10 @@
Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true" Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
Width="800px" Height="600px"> Width="800px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window3" Title="轴测图" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
Width="800px" Height="600px">
</f:Window>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+22
View File
@@ -460,7 +460,29 @@ namespace FineUIPro.Web.HJGL.InfoQuery
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineQueryChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineQueryChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - ")));
} }
protected void btnJoinMarke_Click(object sender, EventArgs e)
{ //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
//var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
var id = Grid1.SelectedRowID;
if (string.IsNullOrEmpty(id))
{
ShowNotify("请选择相对应的ISO轴测图", MessageBoxIcon.Warning);
return;
}
var SingleName = (from x in Funs.DB.View_HJGL_Pipeline where x.PipelineId == id select (x.SingleName)).FirstOrDefault();
var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, "0", this.CurrUser.LoginProjectId);
if (filemodel != null)
{
string httpUrl = filemodel.FilePath;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../JoinMarking/JoinMarking.aspx?ISO_ID=?fileUrl={0}", httpUrl, "查看 -")));
}
else
{
ShowNotify("请上传相关ISO轴测图", MessageBoxIcon.Warning);
return;
}
}
protected void btnSinglePreview_Click(object sender, EventArgs e) protected void btnSinglePreview_Click(object sender, EventArgs e)
{ {
//string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf"; //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs
Generated
+18
View File
@@ -176,6 +176,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnGetChart; protected global::FineUIPro.Button btnGetChart;
/// <summary>
/// btnJoinMarke 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnJoinMarke;
/// <summary> /// <summary>
/// btnSinglePreview 控件。 /// btnSinglePreview 控件。
/// </summary> /// </summary>
@@ -274,5 +283,14 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Window Window2; protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
} }
} }
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs
+1
View File
@@ -270,6 +270,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
newDataInTemp.Y = item.Value<string>("y"); newDataInTemp.Y = item.Value<string>("y");
newDataInTemp.X2 = item.Value<string>("x2"); newDataInTemp.X2 = item.Value<string>("x2");
newDataInTemp.Y2 = item.Value<string>("y2"); newDataInTemp.Y2 = item.Value<string>("y2");
newDataInTemp.AttachSourceId = FileId;
newDataInTemp.WeldingMode = "手动"; newDataInTemp.WeldingMode = "手动";
WeldJointlist.Add(newDataInTemp); WeldJointlist.Add(newDataInTemp);
} }