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

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

Browse Source
This commit is contained in:
李鹏飞
2026-05-30 17:46:03 +08:00
parent fc8ddedbe3 374d1ed635
commit b7bcf5c56a
31 changed files with 741 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-05-30-gf.sql
+17
View File
@@ -0,0 +1,17 @@
delete from Sys_Menu where MenuId='B13BFFA5-3112-4209-8562-5329B78B405C'
delete from Sys_Menu where MenuId='5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC'
delete from Sys_Menu where MenuId='0A3F6AB0-535E-489C-9F64-4FFE61C17085'
delete from Sys_Menu where MenuId='DB50A5AA-08DB-4915-9173-6DB133CA76F0'
GO
update Sys_Menu set SortIndex=10 where MenuId='53948077-B51D-4FF3-BFB0-AB4E27C42875'
update Sys_Menu set SortIndex=40 where MenuId='BD9C587E-17C2-49F1-82AE-A05117E41D89'
update Sys_Menu set MenuName='°ü×°¹ÜÀí',SortIndex=50 where MenuId='25DED954-10C9-47CC-99F2-C44FDE9E0A81'
update Sys_Menu set MenuName='·¢»õ¹ÜÀí',SortIndex=60 where MenuId='EEC0D060-C15E-4D25-B015-C2B91F735DAC'
GO
DataBase/版本日志/SGGLDB_V2026-05-30-lc.sql
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -17174,7 +17174,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
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
+4 -1
View File
@@ -14,7 +14,7 @@
</head>
<body>
<form id="form1" runat="server">
<f:HiddenField ID="hdIds" runat="server"></f:HiddenField>
<input id="hdpdfurl2" type="hidden" value="<%=URL %>" />
<input id="resultdata" type="hidden" runat="server" />
@@ -45,6 +45,9 @@
<f:RenderField Width="70px" HeaderText="管线号" ColumnID="pipe_no" DataField="pipe_no"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:RenderField Width="70px" HeaderText="材料编码" ColumnID="code" DataField="code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:RenderField Width="70px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs
+41 -25
View File
@@ -141,7 +141,7 @@ namespace FineUIPro.Web.HJGL.DataIn
fileName = row["text"].ToString();
}
}
outputPath = $"{outputPath}/" + fileName + DateTime.Now.ToString("yyyyMMddHHmm") + ".pdf";
outputPath = $"{outputPath}/" + fileName + DateTime.Now.ToString("yyyyMMddHHmm")+(i + 1) + ".pdf";
}
}
@@ -241,8 +241,17 @@ namespace FineUIPro.Web.HJGL.DataIn
//}
Funs.DB.SubmitChanges();
//保存文件到附件
var attatch = AttachFileService.GetAttachFileByToKeyId(isoInfo.PipelineId);
if (attatch != null)
{
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, attatch.AttachSource), attatch.AttachUrl+","+ outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId);
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId);
}
else
{
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId);
}
}
}
}
@@ -330,6 +339,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dt.Columns.Add("description");
dt.Columns.Add("spec");
dt.Columns.Add("qty");
dt.Columns.Add("code");
dt.Columns.Add("page_no");
dt.Columns.Add("remark");
@@ -369,28 +379,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["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)
@@ -415,6 +404,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["pipe_no"].ToString()))
{
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
row["pipe_no"] = rowOther["text"];
}
dt.Rows.Add(row);
}
BindGrid();
}
}
@@ -453,7 +467,9 @@ namespace FineUIPro.Web.HJGL.DataIn
DrawingRecognitionContentEdit.dicDt.Add(CurrUser.PersonId, dt);
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "维护 - ")));
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdIds.ClientID) + Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "编辑 - ")));
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "维护 - ")));
}
else
{
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs
Generated
+9
View File
@@ -23,6 +23,15 @@ namespace FineUIPro.Web.HJGL.DataIn
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// hdIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdIds;
/// <summary>
/// resultdata 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx
+5 -1
View File
@@ -51,7 +51,11 @@
<f:TextArea runat="server" Label="描述" ID="txtDescription" Readonly="true" Height="50px" LabelWidth="120px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs
+9 -2
View File
@@ -74,9 +74,16 @@
dataInTemp["page_no"] = this.txtPageNo.Text;
dataInTemp["description"] = this.txtDescription;
Alert.ShowInTop("信息修改完成！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference("") + ActiveWindow.GetHidePostBackReference());
if (ckAll.Checked)
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Index.ToString()) + ActiveWindow.GetHidePostBackReference());
}
else
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference("") + ActiveWindow.GetHidePostBackReference());
}
dicDt.Remove(CurrUser.PersonId);
}
#endregion
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs
Generated
+9
View File
@@ -130,5 +130,14 @@ namespace FineUIPro.Web.HJGL.DataIn
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtDescription;
/// <summary>
/// ckAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckAll;
}
}
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx
+13 -6
View File
@@ -81,12 +81,19 @@
Locked="true">
</f:WindowField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
<f:TemplateField Width="130px" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitId">
<ItemTemplate>
<asp:Label ID="Label10" runat="server" Text='<%# ConvertUnit(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="130px" HeaderText="单位工程" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitWorkId">
<ItemTemplate>
<asp:Label ID="Label11" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="DetectionType">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertDetectionType(Eval("DetectionType")) %>'></asp:Label>
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs
+26 -2
View File
@@ -647,12 +647,36 @@ namespace FineUIPro.Web.HJGL.DataIn
isoList[i].PipingClassId = iso.PipingClassId;
}
}
this.IsoGrid.DataSource = this.isoList;
this.IsoGrid.DataBind();
}
public static string ConvertUnitWork(object UnitWorkId)
{
if (UnitWorkId != null)
{
var unitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == UnitWorkId.ToString());
if (unitWork != null)
{
return unitWork.UnitWorkName;
}
}
return null;
}
public static string ConvertUnit(object UnitId)
{
if (UnitId != null)
{
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == UnitId.ToString());
if (unit != null)
{
return unit.UnitName;
}
}
return null;
}
public static string ConvertDetectionType(object DetectionTypeId)
{
if (DetectionTypeId != null)
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs
Generated
+18
View File
@@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.DataIn
/// </remarks>
protected global::FineUIPro.Grid IsoGrid;
/// <summary>
/// Label10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label10;
/// <summary>
/// Label11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label11;
/// <summary>
/// Label1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx
+38 -18
View File
@@ -48,87 +48,107 @@
</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>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Hidden="true" Text="是否批量修改"></f:CheckBox>
</Items>
</f:FormRow>
</Rows>
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>
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+1 -13
View File
@@ -48,20 +48,8 @@
</f:Panel>
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
ShowHeader="false" Layout="Fit" BoxConfigAlign="Stretch">
<Items>
<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" RegionPercent="70%"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" AutoScroll="true">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:_3dlook id="ctlAuditFlow" runat="server" width="1000px" height="1000px" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="管线信息"
TitleToolTip="管线信息" AutoScroll="true" RegionPercent="30%">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+10 -10
View File
@@ -125,7 +125,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
//ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
@@ -499,8 +499,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
model.WeldJointCode = this.txtWeldJointCode.Text;
var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model);
if (!string.IsNullOrEmpty(ctlAuditFlow.Url))
{
//if (!string.IsNullOrEmpty(ctlAuditFlow.Url))
//{
get3DParmeter_weldjoint(list);//获取三维所需焊口参数
var q = list.Where(x => !string.IsNullOrEmpty(x.WeldingDate));
var q2 = list.Where(x => x.JointAttribute == "预制口");
@@ -511,7 +511,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
this.JointNoComplete = sumcount - JointComplete;
this.JointPre = q2.Count();
this.JointNoPre = sumcount - JointPre;
}
//}
Model.Parameter3D parameter3D = new Model.Parameter3D();
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
@@ -544,9 +544,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
//ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
//ctlAuditFlow.data = parameter3D;
//ctlAuditFlow.BindData();
}
/// <summary>
@@ -866,9 +866,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
//ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
//ctlAuditFlow.data = parameter3D;
//ctlAuditFlow.BindData();
}
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.designer.cs
Generated
+31 -60
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.InfoQuery
{
public partial class JointQuery
{
namespace FineUIPro.Web.HJGL.InfoQuery {
public partial class JointQuery {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdUnitWorkId 控件。
/// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdUnitWorkId;
/// <summary>
/// tvPipeCode 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tvPipeCode;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// btnTreeFind 控件。
/// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTreeFind;
/// <summary>
/// btnrefresh 控件。
/// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnrefresh;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// Panel2 控件。
/// </summary>
@@ -121,34 +119,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// panelTopRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelTopRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls._3DLook ctlAuditFlow;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -157,7 +128,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -166,7 +137,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -175,7 +146,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@@ -184,7 +155,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@@ -193,7 +164,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
@@ -202,7 +173,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -211,7 +182,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnOutNoComPipeline 控件。
/// </summary>
@@ -220,7 +191,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOutNoComPipeline;
/// <summary>
/// btnGetChart 控件。
/// </summary>
@@ -229,7 +200,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGetChart;
/// <summary>
/// labNumber 控件。
/// </summary>
@@ -238,7 +209,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -247,7 +218,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -256,7 +227,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -265,7 +236,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -274,7 +245,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+9 -13
View File
@@ -38,20 +38,8 @@
</f:Panel>
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
ShowHeader="false" Layout="Fit" BoxConfigAlign="Stretch">
<Items>
<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" RegionPercent="70%"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" AutoScroll="true">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:_3DLook ID="ctlAuditFlow" runat="server" Width="1000px" Height="1000px" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="管线信息"
TitleToolTip="管线信息" AutoScroll="true" RegionPercent="30%" >
@@ -76,6 +64,9 @@
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
</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轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
</f:Button>
@@ -213,6 +204,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
@@ -246,6 +238,10 @@
Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
Width="800px" Height="600px">
</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>
<script type="text/javascript">
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+27 -7
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
//}
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
//ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
if (!IsPostBack)
{
@@ -460,7 +460,27 @@ namespace FineUIPro.Web.HJGL.InfoQuery
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;
}
if (id != null)
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../JoinMarking/JoinMarking.aspx?ISO_ID={0}", id, "查看 -")));
}
else
{
ShowNotify("请上传相关ISO轴测图", MessageBoxIcon.Warning);
return;
}
}
protected void btnSinglePreview_Click(object sender, EventArgs e)
{
//string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
@@ -504,9 +524,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
//ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
//ctlAuditFlow.data = parameter3D;
//ctlAuditFlow.BindData();
}
protected void btnSinglePreview_2_Click(object sender, EventArgs e)
@@ -547,9 +567,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
//ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
//ctlAuditFlow.data = parameter3D;
//ctlAuditFlow.BindData();
}
}
}
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs
Generated
+47 -58
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.InfoQuery
{
public partial class PipelineQuery
{
namespace FineUIPro.Web.HJGL.InfoQuery {
public partial class PipelineQuery {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnrefresh 控件。
/// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnrefresh;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// Panel2 控件。
/// </summary>
@@ -85,34 +83,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// panelTopRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelTopRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls._3DLook ctlAuditFlow;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -121,7 +92,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -130,7 +101,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
@@ -139,7 +110,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// drpIsFinish 控件。
/// </summary>
@@ -148,7 +119,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsFinish;
/// <summary>
/// btnQuery 控件。
/// </summary>
@@ -157,7 +128,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -166,7 +137,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnGetChart 控件。
/// </summary>
@@ -175,6 +146,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGetChart;
/// <summary>
/// btnJoinMarke 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnJoinMarke;
/// <summary>
/// btnSinglePreview 控件。
@@ -184,7 +164,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSinglePreview;
/// <summary>
/// btnSinglePreview_2 控件。
/// </summary>
@@ -193,7 +173,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSinglePreview_2;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -202,7 +182,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -211,7 +191,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// txtIsFinished 控件。
/// </summary>
@@ -220,7 +200,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label txtIsFinished;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -229,7 +209,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -238,7 +218,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -247,7 +227,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -256,7 +236,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -265,7 +245,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -274,5 +254,14 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
}
}
SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx
+1 -1
View File
@@ -60,7 +60,7 @@
LabelWidth="100px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true"
EnableBlurEvent="true" OnBlur="txtText_TextChanged" LabelAlign="Right">
</f:NumberBox>
<f:TextBox ID="txtSpecification" Label="规格" runat="server" Readonly="true"
<f:TextBox ID="txtSpecification" Label="规格" runat="server"
LabelWidth="100px" ShowRedStar="true" Required="true" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpWeldTypeCode" Label="焊缝类型"
SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs
+12 -86
View File
@@ -81,26 +81,15 @@ namespace FineUIPro.Web.HJGL.JoinMarking
if (!string.IsNullOrEmpty(WeldJointId))
{
Model.HJGL_WeldJoint joint = dic[WeldJointId];
Model.WPQ_WPQList list = BLL.WPQListServiceService.GetWPQById(joint.WPQId);
this.txtWpqId.Text = joint.WPQId;
if (joint != null)
{
this.PipelineId = joint.PipelineId;
if (list != null)
{
this.txtWPQCode.Text = list.WPQCode;
this.txtWpqId.Text = list.WPQId;
}
if (Request.Params["Type"] == "add") //插入焊口
{
var baseWeldJoints = BLL.WeldJointService.GetBaseWeldJointsByWeldJointId(WeldJointId);
this.txtWeldJointCode.Text = joint.WeldJointCode + "Z-" + (baseWeldJoints.Count + 1).ToString();
}
else
{
this.txtWeldJointCode.Text = joint.WeldJointCode;
}
this.txtWeldJointCode.Text = joint.WeldJointCode;
if (!string.IsNullOrEmpty(joint.Material1Id))
{
this.drpMaterial1.SelectedValue = joint.Material1Id;
@@ -166,14 +155,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
drpJointAttribute.SelectedValue = joint.JointAttribute;
}
//if (!string.IsNullOrEmpty(joint.Components1Id))
//{
// drpComponent1.SelectedValue = joint.Components1Id;
//}
//if (!string.IsNullOrEmpty(joint.Components2Id))
//{
// drpComponent2.SelectedValue = joint.Components2Id;
//}
this.txtPreTemperature.Text = joint.PreTemperature;
this.txtSpecification.Text = joint.Specification;
txtRemark.Text = joint.Remark;
@@ -181,35 +163,12 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{
drpIsHotProess.SelectedValue = joint.IsHotProess.Value.ToString();
}
//if (!string.IsNullOrEmpty(joint.DesignIsHotProess.ToString()))
//{
// drpDesignIsHotProess.SelectedValue = joint.DesignIsHotProess.Value.ToString();
//}
}
}
else
{
if (!string.IsNullOrEmpty(Request.Params["PipelineId"]))
{
this.PipelineId = Request.Params["PipelineId"];
}
}
Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId);
if (!string.IsNullOrEmpty(isTwoJoint))
{
//string perfix = txtPipelineCode.Text + "/Z-";
string perfix = pipeline.PipelineCode + "/";
this.txtWeldJointCode.Text = perfix;
// txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
// txtWeldJointCode.Text = txtWeldJointCode.Text.Replace(perfix, "");
}
}
}
@@ -234,8 +193,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
return;
}
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.PipelineId);
//PageContext.RegisterStartupScript(Window1.GetSaveStateReference(txtWpqId.ClientID, txtWPQCode.ClientID, drpWeldingRod.ClientID, drpWeldingWire.ClientID, drpWeldingMethodId.ClientID, drpGrooveType.ClientID, txtPreTemperature.ClientID, drpMaterial1.ClientID,drpMaterial2.ClientID,txtIsHotProess.ClientID)
// + Window1.GetShowReference(String.Format("SelectWPS.aspx?Material1={0}&Material2={1}&Dia={2}&Thickness={3}&UnitId={4}&WeldingMethod={5}&WeldType={6}", this.drpMaterial1.SelectedValue, this.drpMaterial2.SelectedValue, this.txtDia.Text, this.txtThickness.Text,pipeline.UnitId,this.drpWeldingMethodId.SelectedText,this.drpWeldTypeCode.SelectedText, "维护 - ")));
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(txtWpqId.ClientID, txtWPQCode.ClientID, drpWeldingRod.ClientID, drpWeldingWire.ClientID, drpWeldingMethodId.ClientID, hdWeldingMethodId.ClientID, drpGrooveType.ClientID, hdGrooveType.ClientID, txtPreTemperature.ClientID, txtIsHotProess.ClientID)
+ Window1.GetShowReference(String.Format("SelectWPS.aspx?Material1={0}&Material2={1}&Dia={2}&Thickness={3}&UnitId={4}&WeldingMethod={5}&WeldType={6}", this.drpMaterial1.SelectedValue, this.drpMaterial2.SelectedValue, this.txtDia.Text, this.txtThickness.Text, pipeline.UnitId, this.drpWeldingMethodId.SelectedText, this.drpWeldTypeCode.SelectedText, "维护 - ")));
}
@@ -249,23 +206,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{
string weldJointCode = string.Empty;
int joint = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim());
if (joint != 0)
{
if (joint < 10)
{
weldJointCode = "0" + Convert.ToString(joint);
}
else
{
weldJointCode = Convert.ToString(joint);
}
}
else
{
weldJointCode = this.txtWeldJointCode.Text;
}
if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, WeldJointId))
{
@@ -282,7 +223,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
/// </summary>
private void SaveData(bool isClosed)
{
// if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("页面必填项不能为空", MessageBoxIcon.Warning);
@@ -294,24 +234,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
joint.PipelineId = this.PipelineId;
joint.ProjectId = this.CurrUser.LoginProjectId;
//if (!this.txtWeldJointCode.Text.Contains("G"))
//{
int jointCode = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim());
if (jointCode != 0)
{
if (jointCode < 10)
{
joint.WeldJointCode = "0" + Convert.ToString(jointCode);
}
else
{
joint.WeldJointCode = Convert.ToString(jointCode);
}
}
else
{
joint.WeldJointCode = this.txtWeldJointCode.Text;
}
joint.WeldJointCode = this.txtWeldJointCode.Text;
//}
//else
//{
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx
+1 -1
View File
@@ -59,7 +59,7 @@
</f:ContentPanel>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口标注" EnableCollapse="true" Hidden="true"
runat="server" BoxFlex="1" DataKeyNames="WeldJointId" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="TempId" AllowSorting="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true"
SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Columns>
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs
+36 -24
View File
@@ -1,5 +1,6 @@
using BLL;
using BLL.Common;
using FineUIPro.Web.HJGL.WeldingManage;
using Newtonsoft.Json.Linq;
using NPOI.POIFS.Properties;
using Org.BouncyCastle.Asn1.Tsp;
@@ -16,17 +17,8 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{
public partial class PDFMarking : PageBase
{
public List<Model.HJGL_WeldJoint> WeldJointlist
{
get
{
return (List<Model.HJGL_WeldJoint>)ViewState["ISO_ID"];
}
set
{
ViewState["ISO_ID"] = value;
}
}
public static Dictionary<string, List<Model.HJGL_WeldJoint>> WeldJointlist = new Dictionary<string, List<Model.HJGL_WeldJoint>>();
private string ISO_ID
{
@@ -86,7 +78,15 @@ namespace FineUIPro.Web.HJGL.JoinMarking
FileId = Request.Params["FileId"];
URL = Funs.SGGLUrl + Request.Params["pdfurl"];
this.IsPDMS = "0";
WeldJointlist = new List<Model.HJGL_WeldJoint>();
if (!WeldJointlist.ContainsKey(CurrUser.PersonId))
{
WeldJointlist.Add(CurrUser.PersonId, new List<Model.HJGL_WeldJoint>());
}
else
{
WeldJointlist[ CurrUser.PersonId]= new List<Model.HJGL_WeldJoint>();
}
}
}
@@ -96,10 +96,17 @@ namespace FineUIPro.Web.HJGL.JoinMarking
/// </summary>
private void BindGrid()
{
Grid1.RecordCount = WeldJointlist.Count;
Grid1.DataSource = WeldJointlist;
Grid1.DataBind();
if (WeldJointlist.ContainsKey(CurrUser.PersonId))
{
Grid1.RecordCount = WeldJointlist[CurrUser.PersonId].Count;
Grid1.DataSource = WeldJointlist[CurrUser.PersonId];
}
else
{
Grid1.RecordCount = 0;
Grid1.DataSource = null;
}
Grid1.DataBind();
}
#endregion
@@ -118,7 +125,9 @@ namespace FineUIPro.Web.HJGL.JoinMarking
}
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_DataInMenuId, Const.BtnIn))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
DataInEdit.dic[Grid1.SelectedRowID] = WeldJointlist[CurrUser.PersonId].FirstOrDefault(x => x.WeldJointId == Grid1.SelectedRowID);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataInEdit.aspx?WeldJointId={0}", Grid1.SelectedRowID, "维护 - ")));
}
else
{
@@ -142,7 +151,8 @@ namespace FineUIPro.Web.HJGL.JoinMarking
Alert.ShowInTop("请选择一条记录", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
DataInEdit.dic[Grid1.SelectedRowID] = WeldJointlist[CurrUser.PersonId].FirstOrDefault(x=>x.WeldJointId == Grid1.SelectedRowID);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataInEdit.aspx?WeldJointId={0}", Grid1.SelectedRowID, "维护 - ")));
}
else
{
@@ -168,8 +178,8 @@ namespace FineUIPro.Web.HJGL.JoinMarking
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var WeldJoint = WeldJointlist.FirstOrDefault(x => x.WeldJointId == rowID);
WeldJointlist.Remove(WeldJoint);
var WeldJoint = WeldJointlist[CurrUser.PersonId].FirstOrDefault(x => x.WeldJointId == rowID);
WeldJointlist[CurrUser.PersonId].Remove(WeldJoint);
}
ShowNotify("删除成功！", MessageBoxIcon.Success);
@@ -229,8 +239,9 @@ namespace FineUIPro.Web.HJGL.JoinMarking
protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
{
//beginProgress();
Funs.DB.HJGL_WeldJoint.InsertAllOnSubmit(WeldJointlist);
Funs.DB.HJGL_WeldJoint.InsertAllOnSubmit(WeldJointlist[CurrUser.PersonId]);
Funs.DB.SubmitChanges();
WeldJointlist.Remove(CurrUser.PersonId);
}
#endregion
@@ -254,8 +265,8 @@ namespace FineUIPro.Web.HJGL.JoinMarking
if (iso != null)
{
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.UnitId);
WeldJointlist = new List<Model.HJGL_WeldJoint>();
WeldJointlist[CurrUser.PersonId] = new List<Model.HJGL_WeldJoint>();
for (int i = 0; i < jsonArray.Count; i++)
{
JObject item = jsonArray[i] as JObject;
@@ -270,8 +281,9 @@ namespace FineUIPro.Web.HJGL.JoinMarking
newDataInTemp.Y = item.Value<string>("y");
newDataInTemp.X2 = item.Value<string>("x2");
newDataInTemp.Y2 = item.Value<string>("y2");
newDataInTemp.AttachSourceId = FileId;
newDataInTemp.WeldingMode = "手动";
WeldJointlist.Add(newDataInTemp);
WeldJointlist[CurrUser.PersonId].Add(newDataInTemp);
}
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
+8 -3
View File
@@ -7,13 +7,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<%-- <script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<link rel="modulepreload" crossorigin="" href="./assets/pdf-lib-D5zKcp81.js">
<link rel="modulepreload" crossorigin="" href="./assets/pdfjs-HfNT2Y4W.js">
<link rel="modulepreload" crossorigin="" href="./assets/styles-Bno-H3Kc.js">
<link rel="stylesheet" crossorigin="" href="./assets/styles-CDHjsf7D.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">--%>
<script type="module" crossorigin src="./assets/viewer-XNlksu4U.js"></script>
<link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
<link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
<link rel="modulepreload" crossorigin href="./assets/styles-BZJ2tAi6.js">
<link rel="stylesheet" crossorigin href="./assets/styles-DNToM_5G.css">
<link rel="stylesheet" crossorigin href="./assets/viewer-BilNgxa5.css">
</head>
<body>
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
+22 -4
View File
@@ -101,10 +101,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType from CH_TrustItem AS a
LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID
left join Base_DetectionType c on b.CH_NDTMethod = c.DetectionTypeId
where a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
string sqlTrust = @"select a.WeldJointId, c.DetectionTypeCode,b.TrustType from HJGL_Batch_BatchTrustItem AS a
LEFT JOIN HJGL_Batch_BatchTrust AS b ON a.TrustBatchId = b.TrustBatchId
left join Base_DetectionType c on b.DetectionTypeId = c.DetectionTypeId
where a.WeldJointId in ('" + string.Join("','", jotids) + "') ";
DataTable tbTrust = SQLHelper.GetDataTableRunText(sqlTrust, null);
Dictionary<string, string> DetectionTypeDic = new Dictionary<string, string>();
Dictionary<string, string> TrustTypeDic = new Dictionary<string, string>();
@@ -145,8 +145,26 @@ namespace FineUIPro.Web.HJGL.JoinMarking
}
if (tb1 != null)
{
int i = 0;
foreach (DataRow row in tb1.Rows)
{
i++;
if (i%4 == 1)
{
row["JOT_JointStatus"] = "正常";
}
else if (i % 4 == 2)
{
row["JOT_JointStatus"] = "扩透";
}
else if (i % 4 == 3)
{
row["JOT_JointStatus"] = "点口";
}
else if (i % 4 == 0)
{
row["JOT_JointStatus"] = "已切除";
}
string JOT_ID = row["JOT_ID"].ToString();
if (DetectionTypeDic.ContainsKey(JOT_ID))
{
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+1
View File
@@ -42,6 +42,7 @@
<TreeNode id="66290870-2B12-46CA-8E5D-8CB7233ACB8C" Text="焊接施工基础数据录入" NavigateUrl="HJGL/WeldingManage/WeldingConDate.aspx"></TreeNode>
</TreeNode>
<TreeNode id="43F92EA7-462F-41E6-8D8A-243C03A5317E" Text="信息查询" NavigateUrl=""><TreeNode id="A98C7295-5735-4C8A-9565-7635A9C5D258" Text="管线信息总览" NavigateUrl="HJGL/InfoQuery/PipelineQuery.aspx"></TreeNode>
<TreeNode id="6B16D1D4-FBDA-4B2B-AE0A-B465C686C27D" Text="轴测图" NavigateUrl="HJGL/JoinMarking/JointShow.aspx"></TreeNode>
<TreeNode id="F4275A19-A72E-448E-B0C1-07DB2FCEE224" Text="焊口台账总览" NavigateUrl="HJGL/InfoQuery/JointQuery.aspx"></TreeNode>
<TreeNode id="DB50A5AA-08DB-4915-9173-6DB133CA76F0" Text="库存信息总览" NavigateUrl="HJGL/DataImport/MaterialStock.aspx"></TreeNode>
</TreeNode>
SGGL/FineUIPro.Web/pdf.worker.min.js
Vendored
+22
View File
File diff suppressed because one or more lines are too long
SGGL/Model/Model.cs
+277 -783
View File
File diff suppressed because it is too large Load Diff