diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 608c5b5..4fbd847 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx index 54f8703..a17a212 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx @@ -3,7 +3,7 @@ - 委托单打印 + 点口待审核 @@ -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