2024-03-31

This commit is contained in:
2024-03-31 12:05:02 +08:00
parent 44db76e06a
commit 066ce71002
@@ -617,18 +617,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//GetCanWelderDropDownList(GetWeldingTaskList); //GetCanWelderDropDownList(GetWeldingTaskList);
} }
string unitWorkId = string.Empty, unitId2 = string.Empty; string unitWorkId = string.Empty, unitId2 = string.Empty; string taskdate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|")) if (tvControlItem.SelectedNodeID.Contains("|"))
{ {
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0]; unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId2 = tvControlItem.SelectedNodeID.Split('|')[1]; unitId2 = tvControlItem.SelectedNodeID.Split('|')[1];
taskdate = tvControlItem.SelectedNodeID.Split('|')[2];
} }
else else
{ {
unitWorkId = tvControlItem.SelectedNodeID; unitWorkId = tvControlItem.SelectedNodeID;
} }
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null; List<Model.View_HJGL_WeldingTask> 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); this.BindGrid(GetWeldingTaskList);
Alert.ShowInTop("已生成可焊焊工!", MessageBoxIcon.Success); Alert.ShowInTop("已生成可焊焊工!", MessageBoxIcon.Success);
@@ -984,6 +985,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
string unitWorkId = string.Empty, unitId = string.Empty; string unitWorkId = string.Empty, unitId = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|")) if (tvControlItem.SelectedNodeID.Contains("|"))
{ {
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0]; unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];