2023-10-25

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
@@ -16,17 +16,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <summary>
/// 单位主键
/// </summary>
public string UnitId
{
get
{
return (string)ViewState["UnitId"];
}
set
{
ViewState["UnitId"] = value;
}
}
//public string UnitId
//{
// get
// {
// return (string)ViewState["UnitId"];
// }
// set
// {
// ViewState["UnitId"] = value;
// }
//}
/// <summary>
/// 单位工程主键
/// </summary>
@@ -121,16 +121,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strList = Request.Params["strList"];
List<string> list = Funs.GetStrListByStr(strList, '|');
if (list.Count() == 3)
if (list.Count() == 2)
{
this.UnitWorkId = list[0];
this.UnitId = list[1];
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
if (unit != null)
{
this.txtUnitName.Text = unit.UnitName;
}
TaskDate = list[2];
TaskDate = list[1];
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位
if (!string.IsNullOrEmpty(TaskDate))
{
txtTaskDate.Text = TaskDate;
@@ -142,13 +141,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (task != null)
{
txtTaskCode.Text = task.TaskCode;
drpUnit.SelectedValue = task.UnitId;
}
txtTaskCode.Enabled = false;
}
string projectId = string.Empty;
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
if (UnitWorkId != null)
{
{
projectId = UnitWork.ProjectId;
this.txtUnitWorkName.Text = UnitWork.UnitWorkName;
}
@@ -165,8 +166,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
private void InitTreeMenu()
{
this.tvControlItem.Nodes.Clear();
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_SHOP && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_FIELD && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
TreeNode rootNode1 = new TreeNode();
rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP;
@@ -203,7 +204,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.UnitWorkId
&& x.UnitId == this.UnitId
&& x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode select x).ToList();
@@ -477,7 +477,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask();
NewTask.ProjectId = this.CurrUser.LoginProjectId;
NewTask.UnitWorkId = this.UnitWorkId;
NewTask.UnitId = this.UnitId;
NewTask.UnitId = drpUnit.SelectedValue;
NewTask.TaskCode = this.txtTaskCode.Text.Trim();
NewTask.WeldTaskId = SQLHelper.GetNewID();