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

2023-10-25

Browse Source
This commit is contained in:
李鹏飞
2023-10-25 19:44:10 +08:00
parent 127146e24a
commit fa939f60d3
66 changed files with 522 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+60 -82
View File
@@ -125,12 +125,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select x.TaskDate.Value.Date).Distinct().Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName;
tn1.CommandName = "单位工程";
tn1.ToolTip = "施工单位：" + u.UnitName;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true;
@@ -149,7 +149,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork2)
{
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var a = (from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == q.UnitWorkId
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
@@ -159,7 +159,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName;
tn2.CommandName = "单位工程";
tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true;
rootNode2.Nodes.Add(tn2);
@@ -299,61 +299,61 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#endregion
#region 查找
protected void ckSelect_Click(object sender, EventArgs e)
{
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w != null)
{
string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId;
string strList = UnitWorkId + "|" + UnitId;
string weldJointIds = hdItemsString.Text.Trim();
//#region 查找
//protected void ckSelect_Click(object sender, EventArgs e)
//{
// var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
// if (w != null)
// {
// string UnitId = w.UnitId;
// string UnitWorkId = w.UnitWorkId;
// string strList = UnitWorkId + "|" + UnitId;
// string weldJointIds = hdItemsString.Text.Trim();
var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == w.UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x;
this.hdTaskWeldJoint.Text = string.Empty;
if (task.Count() > 0)
{
foreach (var item in task)
{
this.hdTaskWeldJoint.Text += item.WeldJointId + "|";
}
}
if (!string.IsNullOrEmpty(hdTaskWeldJoint.Text))
{
hdTaskWeldJoint.Text = hdTaskWeldJoint.Text.Substring(0, hdTaskWeldJoint.Text.Length - 1);
}
string TaskWeldJoints = hdTaskWeldJoint.Text.Trim();//任务表已存在的焊口
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}&weldJointIds={1}&TaskWeldJoints={2}", strList, Server.UrlEncode(weldJointIds), Server.UrlEncode(TaskWeldJoints), "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID, hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
}
else
{
Alert.ShowInTop("请选择单位和单位工程", MessageBoxIcon.Warning);
}
}
// var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == w.UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x;
// this.hdTaskWeldJoint.Text = string.Empty;
// if (task.Count() > 0)
// {
// foreach (var item in task)
// {
// this.hdTaskWeldJoint.Text += item.WeldJointId + "|";
// }
// }
// if (!string.IsNullOrEmpty(hdTaskWeldJoint.Text))
// {
// hdTaskWeldJoint.Text = hdTaskWeldJoint.Text.Substring(0, hdTaskWeldJoint.Text.Length - 1);
// }
// string TaskWeldJoints = hdTaskWeldJoint.Text.Trim();//任务表已存在的焊口
// string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}&weldJointIds={1}&TaskWeldJoints={2}", strList, Server.UrlEncode(weldJointIds), Server.UrlEncode(TaskWeldJoints), "编辑 - ");
// PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID, hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
// }
// else
// {
// Alert.ShowInTop("请选择单位和单位工程", MessageBoxIcon.Warning);
// }
//}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
string str1 = hdItemsString.Text;
string str2 = hdTaskWeldJoint.Text;
this.InitTreeMenu();
var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (unit == null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
//protected void Window1_Close(object sender, WindowCloseEventArgs e)
//{
// string str1 = hdItemsString.Text;
// string str2 = hdTaskWeldJoint.Text;
// this.InitTreeMenu();
// var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
// List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
// if (unit == null)
// {
// GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
// }
// else
// {
// GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
}
this.BindGrid(GetWeldingTaskList);
// }
// this.BindGrid(GetWeldingTaskList);
}
//}
#endregion
//#endregion
#region 保存
protected void btnSave_Click(object sender, EventArgs e)
@@ -375,11 +375,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask();
NewTask.ProjectId = this.CurrUser.LoginProjectId;
NewTask.UnitWorkId = getUnit.UnitWorkId;
if (getUnit != null)
{
NewTask.UnitId = getUnit.UnitId;
}
NewTask.WeldTaskId = item.WeldTaskId;
NewTask.WeldJointId = item.WeldJointId;
NewTask.CoverWelderId = item.CoverWelderId;
@@ -451,6 +446,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var i in Grid1.SelectedRowIndexArray)
{
string weldTaskId = Grid1.DataKeys[i][0].ToString();
var taskmodel = WeldTaskService.GetWeldTaskById(weldTaskId);
string unitId = taskmodel.UnitId;//获取任务单的单位
string jotId = Grid1.DataKeys[i][1].ToString();
var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(jotId);
var iso = BLL.PipelineService.GetPipelineByPipelineId(jot.PipelineId);
@@ -483,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string canWeldingWireName = string.Empty;
var projectWelder = from x in Funs.DB.SitePerson_Person
where x.ProjectId == jot.ProjectId && x.States == Const.State_1
&& x.UnitId == iso.UnitId && x.WorkPostId == Const.WorkPost_Welder
&& x.UnitId == unitId && x.WorkPostId == Const.WorkPost_Welder
&& x.WelderCode != null && x.WelderCode != ""
select x;
@@ -853,10 +850,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w != null)
{
string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId;
string taskDate = "";
string strList = UnitWorkId + "|" + UnitId + "|" + taskDate;
string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
@@ -873,7 +869,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNode.ParentNode.NodeID);
if (w != null)
{
string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId;
string taskDate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
@@ -884,7 +879,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
taskDate = tvControlItem.SelectedNodeID;
}
string strList = UnitWorkId + "|" + UnitId + "|" + taskDate;
string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
@@ -979,24 +974,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
this.BindGrid(GetWeldingTaskList);
//GetCanWelderDropDownList(GetWeldingTaskList);
//if (taskTime.Value.Date < DateTime.Now.Date)
//{
// //ckSelect.Hidden = true;
// btnSave.Hidden = true;
// CreatWeldableWeldJoint.Hidden = true;
// btnSaveWelder.Hidden = true;
// txtTaskDate.Hidden = true;
//}
//else
//{
// //ckSelect.Hidden = false;
// btnSave.Hidden = false;
// CreatWeldableWeldJoint.Hidden = false;
// btnSaveWelder.Hidden = false;
// txtTaskDate.Hidden = false;
//}
}
}