From 6c7c257fd29340d0b26f35de6a86b10871ad18cf Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Thu, 23 May 2024 09:35:43 +0800 Subject: [PATCH] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1331712 -> 1352192 bytes .../TrustManage/PointForAudit.aspx | 16 +- .../TrustManage/PointForAudit.aspx.cs | 150 +++++++++++++++++- .../PointForAudit.aspx.designer.cs | 62 +++++--- .../WeldingManage/JointInfoBatchEdit.aspx | 4 +- .../WeldingManage/JointInfoBatchEdit.aspx.cs | 24 +++ .../WeldingManage/JointInfoEdit.aspx | 4 +- .../WeldingManage/JointInfoEdit.aspx.cs | 27 ++++ 8 files changed, 255 insertions(+), 32 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 608c5b503754e40d0c70e35bd0b68b09db29b9bd..4fbd84707c8b8405c035ae3030defcb1fbc8d4c9 100644 GIT binary patch delta 17548 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 delta 15208 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 - 委托单打印 + 点口待审核 @@ -22,20 +22,21 @@ - + + + LabelAlign="Right" EnableEdit="true" Width="170" LabelWidth="90px"> + Label="点口日期" Width="195px"> - + @@ -51,6 +52,9 @@ + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs index 4521272..b9b267d 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs @@ -30,8 +30,13 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage (CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst, JLAudit,GLGSAudit,QTAudit,IsPointAudit FROM dbo.View_Batch_PointBatchItem - WHERE PointState IS NOT NULL"; + WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL"; List listStr = new List(); + if (!string.IsNullOrEmpty(this.txtPipeCode.Text)) + { + strSql += " AND PipelineCode LIKE @PipelineCode"; + listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipeCode.Text.Trim() + "%")); + } if (!string.IsNullOrEmpty(this.txtPointStartDate.Text)) { strSql += " AND PointDate >= @PointStartDate"; @@ -200,5 +205,148 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage return; } } + + /// + /// 手动生成委托单 + /// + /// + /// + protected void btnHandGenerate_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointManageMenuId, Const.BtnHandGenerate)) + { + List selectRow = new List(); + + foreach (string pitem in Grid1.SelectedRowIDArray) + { + selectRow.Add(pitem); + } + + if (selectRow.Count() > 0) + { + List weldMot = new List(); + List grooveType = new List(); + List IsFist = new List(); + List pointBatchIds = new List(); + string error = string.Empty; + + foreach (string pointItemId in selectRow) + { + var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); + weldMot.Add(jot.WeldingMethodId); + grooveType.Add(jot.GrooveTypeId); + IsFist.Add(pointItem.IsWelderFirst == true ? true : false); + pointBatchIds.Add(pointItem.PointBatchId); + } + + if (pointBatchIds.Distinct().Count() > 1) + { + error = "勾选的焊口不在一个批次中，"; + } + if (weldMot.Distinct().Count() > 1) + { + error = "勾选的焊口焊接方法不一至，"; + } + if (grooveType.Distinct().Count() > 1) + { + error = error + "勾选的焊口坡口类型不一至，"; + } + if (IsFist.Distinct().Count() > 1) + { + error = error + "勾选的焊口是否首三不一至，"; + } + + if (error == string.Empty) + { + var point = BLL.Batch_PointBatchService.GetPointBatchById(pointBatchIds[0]); + var iso = BLL.Pipeline_PipelineService.GetPipelineByPipelineId(point.PipelineId); + var project = BLL.Base_ProjectService.GetProjectByProjectId(point.ProjectId); + var unit = BLL.Base_UnitService.GetUnit(point.UnitId); + var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(point.DetectionTypeId); + var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId); + + Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust(); + string perfix = string.Empty; + //perfix = unit.UnitCode + "-" + ins.InstallationCode + "-GD-" + ndt.DetectionTypeCode + "-"; + perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-"; + newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix); + + string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust)); + newBatchTrust.TrustBatchId = trustBatchId; + + newBatchTrust.TrustDate = DateTime.Now; + newBatchTrust.ProjectId = point.ProjectId; + newBatchTrust.UnitId = point.UnitId; + newBatchTrust.InstallationId = point.InstallationId; + newBatchTrust.WorkAreaId = iso.WorkAreaId; + newBatchTrust.WeldingMethodId = weldMot[0]; + newBatchTrust.GrooveTypeId = grooveType[0]; + newBatchTrust.IsWelderFirst = IsFist[0]; + newBatchTrust.DetectionTypeId = point.DetectionTypeId; + newBatchTrust.PipelineId = point.PipelineId; + + BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单 + + // 生成委托明细，并回写点口明细信息 + string toPointBatch = string.Empty; + foreach (string pointItemId in selectRow) + { + var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + if (BLL.Batch_PointBatchService.GetIsGenerateTrust(pointItem.PointBatchItemId)) ////生成委托单的条件判断 + { + if (!toPointBatch.Contains(pointItem.PointBatchId)) + { + toPointBatch = toPointBatch + pointItem.PointBatchId + ","; + } + + Model.Batch_BatchTrustItem trustItem = new Model.Batch_BatchTrustItem + { + TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrustItem)), + TrustBatchId = trustBatchId, + PointBatchItemId = pointItem.PointBatchItemId, + WeldJointId = pointItem.WeldJointId, + //FilmNum = fileNum, + CreateDate = DateTime.Now + }; + Batch_BatchTrustItemService.AddBatchTrustItem(trustItem); + } + + //Model.Batch_PointBatchItem pointBatchItem = Funs.DB.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == item.PointBatchItemId); + + pointItem.IsBuildTrust = true; + Funs.DB.SubmitChanges(); + } + + // 回写委托批对应点口信息 + if (!string.IsNullOrEmpty(toPointBatch)) + { + toPointBatch = toPointBatch.Substring(0, toPointBatch.Length - 1); + var updateTrut = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId); + if (updateTrut != null) + { + updateTrut.TopointBatch = toPointBatch; + BLL.Batch_BatchTrustService.UpdateBatchTrust(updateTrut); + } + } + + Alert.ShowInTop("委托单已生成！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop(error + "不能组成一个委托单！", MessageBoxIcon.Warning); + } + } + else + { + Alert.ShowInTop("请勾选要生成委托单的焊口！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs index 437c8dd..95dcc3d 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.TrustManage { - - - public partial class PointForAudit { - +namespace FineUIPro.Web.WeldingProcess.TrustManage +{ + + + public partial class PointForAudit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpNoAudit 控件。 /// @@ -65,7 +67,16 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpNoAudit; - + + /// + /// txtPipeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipeCode; + /// /// drpNde 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpNde; - + /// /// txtPointStartDate 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPointStartDate; - + /// /// txtPointEndDate 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPointEndDate; - + /// /// BtnAnalyse 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// ToolbarFill1 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnJLAudit 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnJLAudit; - + /// /// btnGLGSAudit 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnGLGSAudit; - + /// /// btnOtherAudit 控件。 /// @@ -137,7 +148,16 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOtherAudit; - + + /// + /// btnHandGenerate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnHandGenerate; + /// /// ToolbarSeparator1 控件。 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx index 9a4e1ca..b94d512 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx @@ -69,11 +69,11 @@ + AutoPostBack="true" OnTextChanged="txtText_TextChanged" Required="true" Readonly="true"> + AutoPostBack="true" OnTextChanged="txtText_TextChanged" Required="true" Readonly="true"> diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx.cs index ab76941..788306e 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx.cs @@ -324,6 +324,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { if (ansi != "FB") { + txtDia.Readonly = true; + txtThickness.Readonly = true; + if (dn.First().OutSizeDia != null) { dia = dn.First().OutSizeDia.ToString(); @@ -459,6 +462,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage // 非美标FB else { + txtDia.Readonly = false; + txtThickness.Readonly = false; + if (dn.First().OutSize_FB != null) { dia = dn.First().OutSize_FB.ToString(); @@ -482,7 +488,25 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage this.txtSpecification.Text = "Φ" + dia + "×" + sch; } } + } + } + /// + /// 选择外径和壁厚自动获取规格 + /// + /// + /// + protected void txtText_TextChanged(object sender, EventArgs e) + { + string dn = string.Empty; + string s = string.Empty; + if (!string.IsNullOrEmpty(this.txtDia.Text.Trim())) + { + dn = this.txtDia.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim())) + { + this.txtSpecification.Text = "Φ" + dn + "×" + this.txtThickness.Text.Trim(); + } } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx index 9124302..9a42eb8 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx @@ -63,10 +63,10 @@ - - diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs index 67f4019..11c56ba 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs @@ -633,12 +633,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage string ansi = drpANSISCH.SelectedValue; string dia = string.Empty; string sch = string.Empty; + var dn = from x in Funs.DB.Base_DNCompare where x.PipeSize == Funs.GetNewDecimal(txtSize.Text.Trim()) select x; if (dn.Count() > 0) { if (ansi != "FB") { + txtDia.Readonly = true; + txtThickness.Readonly = true; + if (dn.First().OutSizeDia != null) { dia = dn.First().OutSizeDia.ToString(); @@ -774,6 +778,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage else // 非美标FB { + txtDia.Readonly = false; + txtThickness.Readonly = false; + if (dn.First().OutSize_FB != null) { dia = dn.First().OutSize_FB.ToString(); @@ -799,6 +806,26 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } } } + + + /// + /// 选择外径和壁厚自动获取规格 + /// + /// + /// + protected void txtText_TextChanged(object sender, EventArgs e) + { + string dn = string.Empty; + string s = string.Empty; + if (!string.IsNullOrEmpty(this.txtDia.Text.Trim())) + { + dn = this.txtDia.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim())) + { + this.txtSpecification.Text = "Φ" + dn + "×" + this.txtThickness.Text.Trim(); + } + } + } #endregion } } \ No newline at end of file