焊接修改

2024-10-17 21:46:32 +08:00
parent 022aebc00d
commit fec4225aff
62 changed files with 4200 additions and 1016 deletions
@@ -135,6 +135,7 @@
                    </f:DropDownList>
                    <f:TextBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="130px" ></f:TextBox>
                    <f:CheckBox ID="ckbIsGoldJoint" runat="server" Label="是否黄金口" LabelWidth="130px"></f:CheckBox>
+                    <f:CheckBox ID="ckbIsBracket" runat="server" Label="是否支架，贴底片" LabelWidth="150px" AutoPostBack="true" OnCheckedChanged="ckbIsBracket_CheckedChanged"></f:CheckBox>
                </Items>
            </f:FormRow>
            <f:FormRow ColumnWidths="25% 15% 15% 35% "> 
@@ -331,6 +331,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                }
                //是否PMI处理
                ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false;
+                ckbIsBracket.Checked = (jointInfo.IsBracket.HasValue && jointInfo.IsBracket.Value) ? true : false;

                if (jointInfo.IsCancel == true)
                {
@@ -505,6 +506,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                }
                //是否PMI处理
                newJointInfo.IsPMI = ckbIsPMI.Checked;
+                //是否支架，贴底片
+                newJointInfo.IsBracket = ckbIsBracket.Checked;
+

                if (ckbIsGoldJoint.Checked == true)
                {
@@ -835,5 +839,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
            }
        }
        #endregion
+
+        protected void ckbIsBracket_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            if (ckbIsBracket.Checked)
+            {
+                txtSpecification.Readonly = false;
+            }
+            else
+            {
+                txtSpecification.Readonly = true;
+            }
+        }
    }
 }
@@ -320,6 +320,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
        /// </remarks>
        protected global::FineUIPro.CheckBox ckbIsGoldJoint;

+        /// <summary>
+        /// ckbIsBracket 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckbIsBracket;
+
        /// <summary>
        /// drpNDTType 控件。
        /// </summary>
@@ -10,6 +10,7 @@ using NPOI.XSSF.UserModel;
 using System.Linq;
 using BLL;
 using System.Web.Configuration;
+using NPOI.SS.Formula.Functions;

 namespace FineUIPro.Web.WeldingProcess.WeldingManage
 {
@@ -1306,6 +1307,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                    if (isExistFloor && isExistCell)
                    {
                        var wps = BLL.WPQListServiceService.GetWPQById(d.WPQId);
+                        var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(jotId);
+
                        if (!wps.WelderIds.Contains(cellWelderId))
                        {
                            errorCheck += (i + 2) + "行,盖面焊工号：[" + ds.Tables[0].Rows[i]["盖面焊工号"].ToString() + "]验证无焊WPS资质；";
@@ -1315,7 +1318,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                        {
                            errorCheck += (i + 2) + "行,打底焊工号：[" + ds.Tables[0].Rows[i]["打底焊工号"].ToString() + "]验证无焊WPS资质；";
                        }
-
+                        if (jot !=null)
+                        {
+                            if (jot.Thickness < wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness)
+                            {
+                                errorCheck += (i + 2) + "行，焊口信息与WPS编号不匹配，";
+                            }
+                            if (!wps.MaterialId1.Contains(jot.Material1Id) || !wps.MaterialId1.Contains(jot.Material2Id))
+                            {
+                                errorCheck += (i + 2) + "行，焊口信息与WPS编号不匹配，";
+                            }
+                        }
+                        
                    }

                    #region 焊工合格项资质判断
@@ -365,6 +365,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                    {
                        errorCheck += rowIndex + "行，WPS不能为空，";
                    }
+                    if (jot .Thickness< wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness)
+                    {
+                        errorCheck += rowIndex + "行，焊口信息与WPS编号不匹配，";
+                    }
+                    if (!wps.MaterialId1.Contains(jot.Material1Id)|| !wps.MaterialId1.Contains(jot.Material2Id))
+                    {
+                        errorCheck += rowIndex + "行，焊口信息与WPS编号不匹配，";
+                    } 
+

                    // 验证数据是否一至
                    if (!string.IsNullOrEmpty(item.WeldTypeId) && !string.IsNullOrEmpty(jot.WeldTypeId) && item.WeldTypeId != jot.WeldTypeId)