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

提交代码

Browse Source
This commit is contained in:
高飞
2023-12-04 12:11:39 +08:00
parent ea22fad037
commit 1ce0a6da17
14 changed files with 334 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+48 -51
View File
@@ -242,7 +242,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
TreeNode newNode = new TreeNode();
newNode.CommandName = "Date";
newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.NodeID = node.NodeID + "|" + item.UnitId + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
@@ -262,7 +262,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
TreeNode newNode = new TreeNode();
newNode.CommandName = "Date";
newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.NodeID = node.NodeID + "|" + item.UnitId + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
@@ -613,28 +613,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
BLL.WeldTaskService.UpdateCanWelderTask(weldTaskId, canWelderId.Substring(0, canWelderId.Length - 1), canWelderCode.Substring(0, canWelderCode.Length - 1));
}
//GetCanWelderDropDownList(GetWeldingTaskList);
}
DateTime? taskTime = null;
string unitWorkId = string.Empty, unitId2 = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId2 = tvControlItem.SelectedNodeID.Split('|')[1];
}
else
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
unitWorkId = 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);
}
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success);
@@ -935,19 +929,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNode.ParentNode.NodeID);
if (w != null)
{
string UnitWorkId = w.UnitWorkId;
string taskDate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
taskDate = tvControlItem.SelectedNodeID.Split('|')[1];
}
else
{
taskDate = tvControlItem.SelectedNodeID;
}
string strList = UnitWorkId + "|" + taskDate;
//string UnitWorkId = w.UnitWorkId;
//string taskDate = string.Empty;
//if (tvControlItem.SelectedNodeID.Contains("|"))
//{
// taskDate = tvControlItem.SelectedNodeID.Split('|')[2];
//}
//else
//{
// taskDate = tvControlItem.SelectedNodeID;
//}
//string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - ");
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", tvControlItem.SelectedNodeID, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
//PageContext.RegisterStartupScript(Window1.GetShowReference(window));
}
@@ -989,17 +983,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
}
var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (unit == null)
string unitWorkId = string.Empty, unitId = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId = tvControlItem.SelectedNodeID.Split('|')[1];
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
unitWorkId = tvControlItem.SelectedNodeID;
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
@@ -1058,12 +1053,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WeldTaskMenuId);
if (this.tvControlItem.SelectedNode.CommandName == "建筑工程" || this.tvControlItem.SelectedNode.CommandName == "安装工程")
if (this.tvControlItem.SelectedNodeID.Length == 1)
{
this.btnMenuAdd.Hidden = true;
this.btnMotify.Hidden = true;
}
else if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
else if (!this.tvControlItem.SelectedNodeID.Contains("|"))
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
@@ -1071,7 +1066,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
this.btnMotify.Hidden = true;
}
else if (this.tvControlItem.SelectedNode.CommandName == "Date")
else if (this.tvControlItem.SelectedNodeID.Contains("|"))
{
if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
{
@@ -1080,12 +1075,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.btnMenuAdd.Hidden = true;
}
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w == null && this.tvControlItem.SelectedNode.CommandName != "建筑工程" && this.tvControlItem.SelectedNode.CommandName != "安装工程")
if (w == null)
{
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
@@ -1127,22 +1122,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = null;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
}
else
{
taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null)
string unitWorkId = string.Empty, unitId = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId = tvControlItem.SelectedNodeID.Split('|')[1];
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(txtTaskDate.Text), this.rbIsAudit.SelectedValue);
unitWorkId = tvControlItem.SelectedNodeID;
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId, Convert.ToDateTime(txtTaskDate.Text), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
drpCanWelder.Items.Clear();
//GetCanWelderDropDownList(GetWeldingTaskList);
@@ -1202,20 +1199,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void btnSearch_Click(object sender, EventArgs e)
{
//List<Model.View_HJGL_WeldingTask> GetWeldingTaskItem = this.CollectGridJointInfo();
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
}
protected void btnPrint_Click(object sender, EventArgs e)
{
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null)
{
var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue).Select(x => x.PipelineId).Distinct().ToList();
var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue).Select(x => x.PipelineId).Distinct().ToList();
if (pipelines.Any())
{
@@ -1262,10 +1259,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void rbIsAudit_SelectedIndexChanged(object sender, EventArgs e)
{
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
}