diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033202605301043.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033202605301043.pdf new file mode 100644 index 00000000..37542005 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033202605301043.pdf differ diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs index bc5d7733..ec117c82 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs @@ -412,10 +412,10 @@ namespace FineUIPro.Web.HJGL.DataIn row["qty"] = item.Value("qty"); row["page_no"] = item.Value("page_no"); row["remark"] = item.Value("remark"); - if (string.IsNullOrEmpty(row["drawing_number"].ToString())) + if (string.IsNullOrEmpty(row["pipe_no"].ToString())) { var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault(); - row["drawing_number"] = rowOther["text"]; + row["pipe_no"] = rowOther["text"]; } dt.Rows.Add(row); } diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx index 60233e16..3521c6f2 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx @@ -81,12 +81,19 @@ Locked="true"> - - - - + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs index 4897e2a9..70f3fa98 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs @@ -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) diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs index 816250b6..2ed6dfc0 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs @@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.DataIn /// protected global::FineUIPro.Grid IsoGrid; + /// + /// Label10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label10; + + /// + /// Label11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label11; + /// /// Label1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx index 4eb639de..34eb1cf9 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx @@ -95,7 +95,7 @@ - + @@ -148,7 +148,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index 87765e21..a34ae6f0 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -462,19 +462,17 @@ namespace FineUIPro.Web.HJGL.InfoQuery } 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 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) + if (id != null) { - string httpUrl = filemodel.FilePath; - PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../JoinMarking/JoinMarking.aspx?ISO_ID=?fileUrl={0}", httpUrl, "查看 -"))); + + PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../JoinMarking/JoinMarking.aspx?ISO_ID={0}", id, "查看 -"))); } else diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx index 1a22b1de..71ea9cbf 100644 --- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx @@ -60,7 +60,7 @@ LabelWidth="100px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true" EnableBlurEvent="true" OnBlur="txtText_TextChanged" LabelAlign="Right"> - 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 //{ diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx index f60af004..3a0f6a1e 100644 --- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx +++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx @@ -59,7 +59,7 @@