焊口导入增加焊点坐标

2026-03-02 20:03:07 +08:00
parent bc2427b335
commit 39a7bc2f6c
8 changed files with 469 additions and 189 deletions
@@ -730,6 +730,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        }
                    }

+                    // 读取焊点坐标（AE列）
+                    string col29 = Convert.ToString(pds[i].AE);
+                    if (!string.IsNullOrEmpty(col29))
+                    {
+                        pipeline.WeldJointPoint = col29;
+                    }
+
                    if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode))
                    {
                        pipeline.ProjectId = this.CurrUser.LoginProjectId;
@@ -1039,6 +1046,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                  JointAttribute = x.JointAttribute,
                                  ProjectId = this.CurrUser.LoginProjectId,
                                  IsHotProess = x.IsHotProess,
+                                  WeldJointPoint = x.WeldJointPoint,
                              }).DistinctBy(temp => new
                              {
                                  temp.WeldJointCode,
@@ -1054,7 +1062,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                  temp.DetectionTypeId,
                                  temp.JointAttribute,
                                  temp.ProjectId,
-                                  temp.IsHotProess
+                                  temp.IsHotProess,
+                                  temp.WeldJointPoint
                              }).ToList();

            var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
@@ -1076,6 +1085,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                weldJoint.JointAttribute = weldJoints[i].JointAttribute;
                weldJoint.ProjectId = weldJoints[i].ProjectId;
                weldJoint.IsHotProess = weldJoints[i].IsHotProess;
+                weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;

                var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
                if (isExistJot != null) // 更新焊口
@@ -294,6 +294,10 @@
                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
                                                            Width="90px">
                                                        </f:RenderField>
+                                                        <f:RenderField HeaderText="焊点坐标" ColumnID="WeldJointPoint" DataField="WeldJointPoint"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                                            Width="90px">
+                                                        </f:RenderField>
                                                    </Columns>
                                                    <Listeners>
                                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu3" />
@@ -328,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                     IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
                                     Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
                                     WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
-                                     BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark
+                                     BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint
                              FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
            List<SqlParameter> listStr = new List<SqlParameter> { };

@@ -629,10 +629,10 @@ namespace FineUIPro.Web.Person
        /// <param name="e"></param>
        protected void drpRole_SelectedIndexChanged(object sender, EventArgs e)
        {
-            if (this.drpRole.SelectedItemArray.Count() > 4)
+            if (this.drpRole.SelectedItemArray.Count() > 5)
            {
                this.drpRole.SelectedValueArray = null;
-                Alert.ShowInParent("最多可选择4个角色！", MessageBoxIcon.Warning);
+                Alert.ShowInParent("最多可选择5个角色！", MessageBoxIcon.Warning);
            }
            else
            {