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.Common;
using NPOI.SS.Formula.Functions;
using Spire.Pdf;
using Spire.Pdf.Utilities;
using System;
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);
}
// 遍历并提取数据
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)
@@ -417,6 +395,31 @@ namespace FineUIPro.Web.HJGL.DataIn
row["radiographic_examination"] = item.Value<string>("radiographic_examination");
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();
}
}
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx
+37 -17
View File
@@ -48,84 +48,104 @@
</f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpUnitWork" Label ="单位工程"></f:DropDownList>
<f:TextBox ID="txtSingleName" Label="图纸名称"
runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtSingleNumber" Label="单线图号" runat="server"
LabelWidth="140px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSingleNumber" Label="单线图号" runat="server" LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpMedium" Label="介质名称" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:DropDownList ID="drpPipingClass" Label="管道等级" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="140px" >
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<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"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px">
</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>
</f:FormRow>
<f:FormRow>
<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="numDesignPress" Label="设计压力 MPa(g)" runat="server" LabelWidth="140px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="numDesignPress" Label="设计压力 MPa(g)" runat="server" LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpTestMedium" Label="压力试验介质" runat="server"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:TextBox ID="numTestPressure" Label="压力试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="numTestPressure" Label="压力试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpPressurePipingClass" Label="压力管道级别" runat="server"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:NumberBox ID="numPipeLenth" Label="管线长度(m)" runat="server" LabelWidth="140px"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="numPipeLenth" Label="管线长度(m)" runat="server" LabelWidth="140px"></f:NumberBox>
<f:DropDownList ID="drpLeakMedium" Label="泄露试验介质" runat="server"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:TextBox ID="numLeakPressure" Label="泄露试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="numLeakPressure" Label="泄露试验压力 MPa(g)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpPCMedium" Label="吹洗要求" runat="server"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:TextBox ID="numVacuumPressure" Label="真空试验压力 KPa(a)" runat="server" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="numVacuumPressure" Label="真空试验压力 KPa(a)" runat="server" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpMaterial" Label="材质"
runat="server" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
</f:DropDownList>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="140px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="140px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<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_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-");
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);
if (pressUnit != null && pressUnit.SetValue == "2")
@@ -186,19 +187,13 @@ namespace FineUIPro.Web.HJGL.DataIn
{
drpMaterial.SelectedValue = pipeline.MaterialId;
}
}
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)
if (!string.IsNullOrEmpty(pipeline.UnitWorkId))
{
this.ProjectId = workArea.ProjectId;
//this.InstallationId = workArea.InstallationId;
drpUnitWork.SelectedValue = pipeline.UnitWorkId;
}
}
}
}
#endregion
@@ -223,7 +218,6 @@ namespace FineUIPro.Web.HJGL.DataIn
{
SaveData(true);
// 关闭本窗体，然后回发父窗体
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
@@ -242,34 +236,44 @@ namespace FineUIPro.Web.HJGL.DataIn
pipeline.UnitId = drpUnit.SelectedValue;
pipeline.UnitWorkId = this.UnitWorkId;
pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
if (this.drpDetectionRate.SelectedValue != BLL.Const._Null)
{
pipeline.DetectionRateId = this.drpDetectionRate.SelectedValue;
}
else
{
Alert.ShowInTop("请选择探伤比例！");
return;
}
//if (this.drpDetectionRate.SelectedValue != BLL.Const._Null)
//{
// pipeline.DetectionRateId = this.drpDetectionRate.SelectedValue;
//}
//else
//{
// Alert.ShowInTop("请选择探伤比例！");
// 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
{
Alert.ShowInTop("请选择介质！");
return;
}
if (this.drpPipingClass.SelectedValue != BLL.Const._Null)
{
pipeline.PipingClassId = this.drpPipingClass.SelectedValue;
}
else
{
Alert.ShowInTop("请选择管线等级！");
Alert.ShowInTop("请选择单位工程！");
return;
}
//if (this.drpPipingClass.SelectedValue != BLL.Const._Null)
//{
// pipeline.PipingClassId = this.drpPipingClass.SelectedValue;
//}
//else
//{
// Alert.ShowInTop("请选择管线等级！");
// return;
//}
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>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
/// <summary>
/// txtSingleName 控件。
/// </summary>