diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 87ca2703..6a6ed369 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17166,7 +17166,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognition.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognition.aspx.cs index 151ce14e..f35de17a 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognition.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognition.aspx.cs @@ -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; diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx index 7b784837..7e4e615a 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx @@ -14,7 +14,7 @@
- + @@ -45,6 +45,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs index c48a61bb..bc5d7733 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs @@ -330,6 +330,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 +370,7 @@ namespace FineUIPro.Web.HJGL.DataIn dtOther.Rows.Add(row); } - // 遍历并提取数据 - foreach (JObject item in jArray) - { - var row = dt.NewRow(); - row["id"] = item.Value("id"); - row["pipe_no"] = item.Value("pipe_no"); - row["drawing_number"] = item.Value("drawing_number"); - - row["seq_no"] = item.Value("seq_no"); - row["category"] = item.Value("category"); - row["description"] = item.Value("description"); - row["spec"] = item.Value("spec"); - row["qty"] = item.Value("qty"); - row["page_no"] = item.Value("page_no"); - row["remark"] = item.Value("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 +395,31 @@ namespace FineUIPro.Web.HJGL.DataIn row["radiographic_examination"] = item.Value("radiographic_examination"); dtIsoInfo.Rows.Add(row); } + + // 遍历并提取数据 + foreach (JObject item in jArray) + { + var row = dt.NewRow(); + row["id"] = item.Value("id"); + row["pipe_no"] = item.Value("pipe_no"); + row["drawing_number"] = item.Value("drawing_number"); + + row["code"] = item.Value("code"); + row["seq_no"] = item.Value("seq_no"); + row["category"] = item.Value("category"); + row["description"] = item.Value("description"); + row["spec"] = item.Value("spec"); + row["qty"] = item.Value("qty"); + row["page_no"] = item.Value("page_no"); + row["remark"] = item.Value("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(); } } @@ -453,7 +458,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 { diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs index f73611ab..77edb7e7 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs @@ -23,6 +23,15 @@ namespace FineUIPro.Web.HJGL.DataIn /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + /// + /// hdIds 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdIds; + /// /// resultdata 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx index 8ae52538..2cf9f8f6 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx @@ -51,7 +51,11 @@ - + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs index 47b4cfbe..3d34288b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs @@ -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 diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs index 3c9f3981..94a7470b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs @@ -130,5 +130,14 @@ namespace FineUIPro.Web.HJGL.DataIn /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDescription; + + /// + /// ckAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckAll; } } diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx index 5fbd3d02..4eb639de 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx @@ -48,84 +48,104 @@ --%> + + + + + + - - + + + - - + + + - - + + + - - + + + - + + - + + - + + - + + - - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.cs index 17ff14d9..a3addd22 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.cs @@ -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) { diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.designer.cs index 9b67ca35..e83bd1c8 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx.designer.cs @@ -104,6 +104,15 @@ namespace FineUIPro.Web.HJGL.DataIn /// protected global::FineUIPro.DropDownList drpUnit; + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + /// /// txtSingleName 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx index 65a24dcb..20fff08a 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx @@ -64,6 +64,9 @@ + + @@ -201,6 +204,7 @@ FieldType="String" HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left"> + @@ -234,6 +238,10 @@ Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true" Width="800px" Height="600px"> +