diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 70df517d..f275ea3c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -617,18 +617,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage //GetCanWelderDropDownList(GetWeldingTaskList); } - string unitWorkId = string.Empty, unitId2 = string.Empty; + string unitWorkId = string.Empty, unitId2 = string.Empty; string taskdate = string.Empty; if (tvControlItem.SelectedNodeID.Contains("|")) { unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0]; unitId2 = tvControlItem.SelectedNodeID.Split('|')[1]; + taskdate = tvControlItem.SelectedNodeID.Split('|')[2]; } else { unitWorkId = tvControlItem.SelectedNodeID; } List GetWeldingTaskList = null; - GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue); + GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(taskdate), this.rbIsAudit.SelectedValue); this.BindGrid(GetWeldingTaskList); Alert.ShowInTop("已生成可焊焊工!", MessageBoxIcon.Success); @@ -984,6 +985,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } string unitWorkId = string.Empty, unitId = string.Empty; + if (tvControlItem.SelectedNodeID.Contains("|")) { unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];