Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2024-07-10 16:06:09 +08:00
parent 0fc3260083 c1fe6302bb
commit 89875b673b
13 changed files with 613 additions and 178 deletions
@@ -119,7 +119,9 @@ namespace BLL
                Remark = weldJoint.Remark,
                IsTwoJoint = weldJoint.IsTwoJoint,
                SubmitMan = weldJoint.SubmitMan,
-                TwoJointType = weldJoint.TwoJointType
+                TwoJointType = weldJoint.TwoJointType,
+                CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
+                BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId
            };
            if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
            {
@@ -188,7 +190,8 @@ namespace BLL
                newWeldJoint.AttachUrl = weldJoint.AttachUrl;
                newWeldJoint.SubmitMan = weldJoint.SubmitMan;
                newWeldJoint.TwoJointType = weldJoint.TwoJointType;
-
+                newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
+                newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
                db.SubmitChanges();
            }
        }
@@ -387,7 +387,9 @@ namespace BLL
                                    else WeldJointCode end) as '焊口序号',
                                     WeldJointCode as '焊口号',
                                     BackingWelderCode as '打底焊工',
+                                     BackingWelderTeamGroupName as '打底焊工班组',
                                     CoverWelderCode as '盖面焊工',
+                                        CoverWelderTeamGroupName as '盖面焊工班组',
                                     Material1Code as '材质1' ,
                                     Material2Code as '材质2' , 
                                     Dia as '外径' ,