diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs index 24e91bfd..a71e9e64 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs @@ -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 '外径' , diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 4956886d..36d4cf0f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -870,8 +870,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim(); newWeldJoint.CoverWelderId = coverWelderId; newWeldJoint.BackingWelderId = backingWelderId; - newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonById(coverWelderId).TeamGroupId; - newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonById(backingWelderId).TeamGroupId; + newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId,coverWelderId).TeamGroupId; + newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, backingWelderId).TeamGroupId; //if (item.WeldingLocationId != Const._Null) //{ // newWeldJoint.WeldingLocationId = item.WeldingLocationId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index 07bd7fef..b9de329e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -480,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { if (!string.IsNullOrEmpty(node.NodeID)) { - var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x; + var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == node.NodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x; if (jotList.Count() > 0) { foreach (var jot in jotList)