lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2023-12-01 17:52:12 +08:00
parent 877a874667
commit 01f0e4167b
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
View File

@ -20,7 +20,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
//BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
this.InitTreeMenu();//加载树
}

41
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -613,28 +613,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
BLL.WeldTaskService.UpdateCanWelderTask(weldTaskId, canWelderId.Substring(0, canWelderId.Length - 1), canWelderCode.Substring(0, canWelderCode.Length - 1));
}
DateTime? taskTime = null;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
}
else
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList);
//GetCanWelderDropDownList(GetWeldingTaskList);
}
DateTime? taskTime = null;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
}
else
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList);
Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success);
}