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
DataBase/版本日志/SGGLDB_V2023-10-26.sql
+22
View File
@@ -0,0 +1,22 @@
exec sp_rename 'dbo.Base_DNCompare.Sch5S', SCH5S, 'COLUMN'
go
exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN'
go
alter table dbo.WBS_UnitWork
drop constraint FK_WBS_UnitWork_Base_Unit_Unit
go
alter table dbo.HJGL_Pipeline
drop constraint FK_HJGL_Pipeline_Base_Unit
go
alter table dbo.WBS_UnitWork
alter column UnitId nvarchar(300) null
go
alter table dbo.HJGL_Pipeline
alter column UnitId nvarchar(300) null
go
SGGL/BLL/SysManage/UnitService.cs
+17 -1
View File
@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using Model;
namespace BLL namespace BLL
{ {
@@ -439,7 +440,17 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName); Funs.FineUIPleaseSelect(dropName);
} }
} }
public static void InitUnitDropDownListByUnitIds(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
{
dropName.DataValueField = "UnitId";
dropName.DataTextField = "UnitName";
dropName.DataSource = BLL.UnitService.getUnitByUnitIds(unitId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary> /// <summary>
/// 根据项目Id获取单位名称下拉选择项（不包含某个单位） /// 根据项目Id获取单位名称下拉选择项（不包含某个单位）
/// </summary> /// </summary>
@@ -757,5 +768,10 @@ namespace BLL
{ {
return Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitName == unitName); return Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitName == unitName);
} }
public static List<Base_Unit> getUnitByUnitIds(string unitids)
{
return Funs.DB.Base_Unit.Where(e => unitids.Contains(e.UnitId)).ToList();
}
} }
} }
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
+4 -19
View File
@@ -63,33 +63,19 @@ namespace FineUIPro.Web.HJGL.DataImport
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
//tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; //tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -98,13 +84,12 @@ namespace FineUIPro.Web.HJGL.DataImport
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
//tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+4 -4
View File
@@ -119,11 +119,11 @@ namespace FineUIPro.Web.HJGL.DataImport
// where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId // where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
// && y.MaterialCode.Contains(txtMaterialCode.Text.Trim()) // && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
// select x.PipelineId).Distinct().Count(); // select x.PipelineId).Distinct().Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -178,7 +178,7 @@ namespace FineUIPro.Web.HJGL.DataImport
// where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId // where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
// && y.MaterialCode.Contains(txtMaterialCode.Text.Trim()) // && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
// select x.PipelineId).Distinct().Count(); // select x.PipelineId).Distinct().Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -186,7 +186,7 @@ namespace FineUIPro.Web.HJGL.DataImport
//{ //{
// tn2.Expanded = true; // tn2.Expanded = true;
//} //}
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
+4 -17
View File
@@ -62,33 +62,20 @@ namespace FineUIPro.Web.HJGL.DataImport
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
//tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; //tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -98,12 +85,12 @@ namespace FineUIPro.Web.HJGL.DataImport
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
//tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
+4 -17
View File
@@ -77,32 +77,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
BindNodes(tn1); BindNodes(tn1);
} }
@@ -112,11 +99,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
BindNodes(tn2); BindNodes(tn2);
} }
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
-2
View File
@@ -108,7 +108,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count(); int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
@@ -132,7 +131,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count(); int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
-2
View File
@@ -143,7 +143,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = reportItems.Count() - trustItems.Count(); int num = reportItems.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
@@ -168,7 +167,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = reportItems.Count() - trustItems.Count(); int num = reportItems.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx
+1 -1
View File
@@ -50,7 +50,7 @@
Required="true" runat="server" LabelWidth="190px" FocusOnPageLoad="true"> Required="true" runat="server" LabelWidth="190px" FocusOnPageLoad="true">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpHardTrustUnit" Label="委托单位" runat="server" <f:DropDownList ID="drpHardTrustUnit" Label="委托单位" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="190px" Readonly="true"> ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="190px" >
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称"
LabelAlign="Right" LabelWidth="190px" EnableEdit="true" ShowRedStar="true" Required="true" Readonly="true"> LabelAlign="Right" LabelWidth="190px" EnableEdit="true" ShowRedStar="true" Required="true" Readonly="true">
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs
-4
View File
@@ -115,10 +115,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
if (!string.IsNullOrEmpty(unitWorkId)) if (!string.IsNullOrEmpty(unitWorkId))
{ {
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
if (w.UnitId != null)
{
drpHardTrustUnit.SelectedValue = w.UnitId;
}
if (w.NDEUnit != null) if (w.NDEUnit != null)
{ {
drpCheckUnit.SelectedValue = w.NDEUnit; drpCheckUnit.SelectedValue = w.NDEUnit;
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
+9 -9
View File
@@ -77,9 +77,10 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) /*if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ {
unitWork1 = (from x in unitWorkList unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
@@ -90,20 +91,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
} }
else else
{ {
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); }*/
}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
BindNodes(tn1); BindNodes(tn1);
} }
@@ -113,11 +113,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
BindNodes(tn2); BindNodes(tn2);
} }
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
-2
View File
@@ -110,7 +110,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count(); int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
@@ -134,7 +133,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count(); int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
-2
View File
@@ -153,7 +153,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
where x.UnitWorkId == q.UnitWorkId where x.UnitWorkId == q.UnitWorkId
select x).ToList(); select x).ToList();
int num = weldJoints.Count() - trustItems.Count(); int num = weldJoints.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
@@ -182,7 +181,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
where x.UnitWorkId == q.UnitWorkId where x.UnitWorkId == q.UnitWorkId
select x).ToList(); select x).ToList();
int num = weldJoints.Count() - trustItems.Count(); int num = weldJoints.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
if (num > 0) if (num > 0)
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx
+1 -1
View File
@@ -51,7 +51,7 @@
LabelWidth="180px"> LabelWidth="180px">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnitId" Label="单位名称" runat="server" <f:DropDownList ID="drpUnitId" Label="单位名称" runat="server"
ShowRedStar="true" Required="true" Readonly="true" LabelAlign="Right" LabelWidth="140px"> ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px">
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx.cs
-1
View File
@@ -106,7 +106,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
if (!string.IsNullOrEmpty(unitWorkId)) if (!string.IsNullOrEmpty(unitWorkId))
{ {
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
drpUnitId.SelectedValue = w.UnitId;
this.drpUnitWork.SelectedValue = w.UnitWorkId; this.drpUnitWork.SelectedValue = w.UnitWorkId;
} }
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+4 -4
View File
@@ -154,11 +154,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
@@ -186,7 +186,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
select x).Count(); select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -194,7 +194,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{ {
tn2.Expanded = true; tn2.Expanded = true;
} }
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+4 -4
View File
@@ -102,11 +102,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -116,11 +116,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
+16 -16
View File
@@ -98,31 +98,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} // }
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
+16 -16
View File
@@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
+16 -16
View File
@@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} // }
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
+4 -4
View File
@@ -100,11 +100,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<f:TextBox ID="txtsysName" Label="系统名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px"> <f:TextBox ID="txtsysName" Label="系统名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" <f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"
Readonly="true"> >
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnitWork" Label="单位工程名称" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" <f:DropDownList ID="drpUnitWork" Label="单位工程名称" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"
Readonly="true"> Readonly="true">
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx.cs
-1
View File
@@ -106,7 +106,6 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
if (!string.IsNullOrEmpty(unitWorkId)) if (!string.IsNullOrEmpty(unitWorkId))
{ {
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
drpUnit.SelectedValue = w.UnitId;
this.drpUnitWork.SelectedValue = w.UnitWorkId; this.drpUnitWork.SelectedValue = w.UnitWorkId;
} }
} }
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+4 -4
View File
@@ -157,11 +157,11 @@ namespace FineUIPro.Web.HJGL.NDT
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
@@ -174,11 +174,11 @@ namespace FineUIPro.Web.HJGL.NDT
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var getUnitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + getUnitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+4 -4
View File
@@ -101,11 +101,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+4 -4
View File
@@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -94,11 +94,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+4 -4
View File
@@ -119,11 +119,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -133,11 +133,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+4 -4
View File
@@ -86,11 +86,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1+"|"+Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1+"|"+Funs.GetEndPageNumber(a, pageSize);
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
@@ -114,7 +114,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -122,7 +122,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{ {
tn2.Expanded = true; tn2.Expanded = true;
} }
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs
+4 -4
View File
@@ -121,11 +121,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
{ {
//int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); //int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
if (a > 0) if (a > 0)
@@ -139,13 +139,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId==q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId==q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
// tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; // tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.Text = q.UnitWorkName ; tn2.Text = q.UnitWorkName ;
tn2.CommandName = "主项"; tn2.CommandName = "主项";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
if (a>0) if (a>0)
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
+16 -16
View File
@@ -98,31 +98,31 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
+16 -16
View File
@@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
+16 -18
View File
@@ -96,31 +96,30 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -131,12 +130,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
+4 -4
View File
@@ -101,11 +101,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -118,11 +118,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<f:TextBox ID="txtsysName" Label="系统名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px"> <f:TextBox ID="txtsysName" Label="系统名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" <f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"
Readonly="true"> >
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnitWork" Label="单位工程名称" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" <f:DropDownList ID="drpUnitWork" Label="单位工程名称" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"
Readonly="true"> Readonly="true">
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx.cs
-1
View File
@@ -105,7 +105,6 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
if (!string.IsNullOrEmpty(unitWorkId)) if (!string.IsNullOrEmpty(unitWorkId))
{ {
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
drpUnit.SelectedValue = w.UnitId;
this.drpUnitWork.SelectedValue = w.UnitWorkId; this.drpUnitWork.SelectedValue = w.UnitWorkId;
} }
} }
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
+4 -4
View File
@@ -201,11 +201,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
BindNodes(tn1); BindNodes(tn1);
@@ -216,11 +216,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
BindNodes(tn2); BindNodes(tn2);
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs
+4 -6
View File
@@ -76,12 +76,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -92,12 +91,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
+16 -18
View File
@@ -99,31 +99,30 @@ namespace FineUIPro.Web.HJGL.TestPackage
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -134,12 +133,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
+4 -6
View File
@@ -119,12 +119,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -136,12 +135,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.ToolTip = "试压包存在未闭合尾项记录红色提醒，存在流程未闭合记录黄色提醒"; tn2.ToolTip = "试压包存在未闭合尾项记录红色提醒，存在流程未闭合记录黄色提醒";
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
+4 -4
View File
@@ -113,11 +113,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -129,11 +129,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
+4 -4
View File
@@ -163,11 +163,11 @@
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
@@ -179,11 +179,11 @@
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+4 -6
View File
@@ -120,12 +120,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -137,12 +136,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs
-1
View File
@@ -126,7 +126,6 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (!string.IsNullOrEmpty(unitWorkId)) if (!string.IsNullOrEmpty(unitWorkId))
{ {
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
drpUnit.SelectedValue = w.UnitId;
this.drpUnitWork.SelectedValue = w.UnitWorkId; this.drpUnitWork.SelectedValue = w.UnitWorkId;
} }
} }
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+4 -4
View File
@@ -84,11 +84,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
@@ -108,7 +108,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
tn2.Expanded = true; tn2.Expanded = true;
} }
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx
+3 -2
View File
@@ -41,9 +41,10 @@
<f:TextBox ID="txtPipelineCode" Label="管线号" ShowRedStar="true" <f:TextBox ID="txtPipelineCode" Label="管线号" ShowRedStar="true"
Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px"> Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtUnitName" Label="单位名称" Readonly="true" <f:DropDownList runat="server" ID="drpUnit" Label ="单位名称"></f:DropDownList>
<%--<f:TextBox ID="txtUnitName" Label="单位名称" Readonly="true"
runat="server" LabelWidth="140px"> runat="server" LabelWidth="140px">
</f:TextBox> </f:TextBox>--%>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.cs
+10 -4
View File
@@ -80,6 +80,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
this.PipelineId = Request.Params["PipelineId"]; this.PipelineId = Request.Params["PipelineId"];
Base_MediumService.InitMediumDropDownList(this.drpMedium, this.CurrUser.LoginProjectId, true); Base_MediumService.InitMediumDropDownList(this.drpMedium, this.CurrUser.LoginProjectId, true);
Base_TestMediumService.InitMediumDropDownList(this.drpTestMedium, "1", true); Base_TestMediumService.InitMediumDropDownList(this.drpTestMedium, "1", true);
Base_PipingClassService.InitPipingClassDropDownList(this.drpPipingClass, this.CurrUser.LoginProjectId, true, "-请选择-"); Base_PipingClassService.InitPipingClassDropDownList(this.drpPipingClass, this.CurrUser.LoginProjectId, true, "-请选择-");
@@ -89,6 +90,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true); Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true);
Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-"); Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-");
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1 BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId); Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId);
if (pressUnit != null && pressUnit.SetValue == "2") if (pressUnit != null && pressUnit.SetValue == "2")
{ {
@@ -99,12 +101,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
if (!string.IsNullOrEmpty(this.PipelineId)) if (!string.IsNullOrEmpty(this.PipelineId))
{ {
Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId); Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWorkService.getUnitWorkByUnitWorkId(pipeline.UnitWorkId).UnitId, true);//单位
this.ProjectId = pipeline.ProjectId; this.ProjectId = pipeline.ProjectId;
this.UnitId = pipeline.UnitId; this.UnitId = pipeline.UnitId;
this.UnitWorkId = pipeline.UnitWorkId; this.UnitWorkId = pipeline.UnitWorkId;
this.txtPipelineCode.Text = pipeline.PipelineCode; this.txtPipelineCode.Text = pipeline.PipelineCode;
this.txtUnitName.Text = pipeline.UnitName; //this.txtUnitName.Text = pipeline.UnitName;
drpUnit.SelectedValue=pipeline.UnitId;
this.txtSingleName.Text = pipeline.SingleName; this.txtSingleName.Text = pipeline.SingleName;
if (!string.IsNullOrEmpty(pipeline.MediumId)) if (!string.IsNullOrEmpty(pipeline.MediumId))
@@ -181,12 +187,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
this.UnitWorkId = Request.Params["UnitWorkId"]; this.UnitWorkId = Request.Params["UnitWorkId"];
Model.WBS_UnitWork workArea = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); Model.WBS_UnitWork workArea = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, workArea.UnitId, false);//单位
if (workArea != null) if (workArea != null)
{ {
this.ProjectId = workArea.ProjectId; this.ProjectId = workArea.ProjectId;
this.UnitId = workArea.UnitId;
//this.InstallationId = workArea.InstallationId; //this.InstallationId = workArea.InstallationId;
this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(this.UnitId);
} }
} }
} }
@@ -229,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline();
pipeline.ProjectId = this.ProjectId; pipeline.ProjectId = this.ProjectId;
//pipeline.InstallationId = this.InstallationId; //pipeline.InstallationId = this.InstallationId;
pipeline.UnitId = this.UnitId; pipeline.UnitId = drpUnit.SelectedValue;
pipeline.UnitWorkId = this.UnitWorkId; pipeline.UnitWorkId = this.UnitWorkId;
pipeline.PipelineCode = this.txtPipelineCode.Text.Trim(); pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
if (this.drpDetectionRate.SelectedValue != BLL.Const._Null) if (this.drpDetectionRate.SelectedValue != BLL.Const._Null)
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.designer.cs
Generated
+6 -4
View File
@@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class PipelineEdit { public partial class PipelineEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -94,13 +96,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
protected global::FineUIPro.TextBox txtPipelineCode; protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary> /// <summary>
/// txtUnitName 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtUnitName; protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// txtSingleName 控件。 /// txtSingleName 控件。
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
+16 -16
View File
@@ -66,31 +66,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} // }
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -100,11 +100,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
+16 -16
View File
@@ -59,31 +59,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork2 = null; List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据 // 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{ //{
unitWork1 = (from x in unitWorkList // unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList(); // select x).ToList();
unitWork2 = (from x in unitWorkList // unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList(); // select x).ToList();
} //}
else //else
{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var u = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + u;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -93,11 +93,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var u = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + u;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+1 -3
View File
@@ -82,9 +82,7 @@
<f:TextBox ID="txtTaskCode" Label="焊接任务单编号" ShowRedStar="true" Required="true" <f:TextBox ID="txtTaskCode" Label="焊接任务单编号" ShowRedStar="true" Required="true"
runat="server" LabelWidth="130px" > runat="server" LabelWidth="130px" >
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtUnitName" Label="单位名称" LabelAlign="Right" <f:DropDownList runat="server" ID="drpUnit" Label ="单位名称"></f:DropDownList>
runat="server" LabelWidth="100px" Enabled="false">
</f:TextBox>
<f:TextBox ID="txtUnitWorkName" Label="单位工程" LabelAlign="Right" <f:TextBox ID="txtUnitWorkName" Label="单位工程" LabelAlign="Right"
runat="server" LabelWidth="100px" Enabled="false"> runat="server" LabelWidth="100px" Enabled="false">
</f:TextBox> </f:TextBox>
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+24 -24
View File
@@ -16,17 +16,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <summary> /// <summary>
/// 单位主键 /// 单位主键
/// </summary> /// </summary>
public string UnitId //public string UnitId
{ //{
get // get
{ // {
return (string)ViewState["UnitId"]; // return (string)ViewState["UnitId"];
} // }
set // set
{ // {
ViewState["UnitId"] = value; // ViewState["UnitId"] = value;
} // }
} //}
/// <summary> /// <summary>
/// 单位工程主键 /// 单位工程主键
/// </summary> /// </summary>
@@ -121,16 +121,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strList = Request.Params["strList"]; string strList = Request.Params["strList"];
List<string> list = Funs.GetStrListByStr(strList, '|'); List<string> list = Funs.GetStrListByStr(strList, '|');
if (list.Count() == 3) if (list.Count() == 2)
{ {
this.UnitWorkId = list[0]; this.UnitWorkId = list[0];
this.UnitId = list[1]; TaskDate = list[1];
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
if (unit != null)
{ Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
this.txtUnitName.Text = unit.UnitName; BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位
}
TaskDate = list[2];
if (!string.IsNullOrEmpty(TaskDate)) if (!string.IsNullOrEmpty(TaskDate))
{ {
txtTaskDate.Text = TaskDate; txtTaskDate.Text = TaskDate;
@@ -142,13 +141,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (task != null) if (task != null)
{ {
txtTaskCode.Text = task.TaskCode; txtTaskCode.Text = task.TaskCode;
drpUnit.SelectedValue = task.UnitId;
} }
txtTaskCode.Enabled = false; txtTaskCode.Enabled = false;
} }
string projectId = string.Empty; string projectId = string.Empty;
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
if (UnitWorkId != null) if (UnitWorkId != null)
{ {
projectId = UnitWork.ProjectId; projectId = UnitWork.ProjectId;
this.txtUnitWorkName.Text = UnitWork.UnitWorkName; this.txtUnitWorkName.Text = UnitWork.UnitWorkName;
} }
@@ -165,8 +166,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
private void InitTreeMenu() private void InitTreeMenu()
{ {
this.tvControlItem.Nodes.Clear(); 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 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.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD && 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(); TreeNode rootNode1 = new TreeNode();
rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP; rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP;
@@ -203,7 +204,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var pipeline = (from x in Funs.DB.HJGL_Pipeline var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.UnitWorkId && x.UnitWorkId == this.UnitWorkId
&& x.UnitId == this.UnitId
&& x.PipeArea == PipeArea && x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode select x).ToList(); orderby x.PipelineCode select x).ToList();
@@ -477,7 +477,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask(); Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask();
NewTask.ProjectId = this.CurrUser.LoginProjectId; NewTask.ProjectId = this.CurrUser.LoginProjectId;
NewTask.UnitWorkId = this.UnitWorkId; NewTask.UnitWorkId = this.UnitWorkId;
NewTask.UnitId = this.UnitId; NewTask.UnitId = drpUnit.SelectedValue;
NewTask.TaskCode = this.txtTaskCode.Text.Trim(); NewTask.TaskCode = this.txtTaskCode.Text.Trim();
NewTask.WeldTaskId = SQLHelper.GetNewID(); NewTask.WeldTaskId = SQLHelper.GetNewID();
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs
Generated
+6 -4
View File
@@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class SelectTaskWeldJoint { public partial class SelectTaskWeldJoint
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -166,13 +168,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
protected global::FineUIPro.TextBox txtTaskCode; protected global::FineUIPro.TextBox txtTaskCode;
/// <summary> /// <summary>
/// txtUnitName 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtUnitName; protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// txtUnitWorkName 控件。 /// txtUnitWorkName 控件。
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+4 -4
View File
@@ -120,11 +120,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
@@ -146,7 +146,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
select x).Count(); select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -154,7 +154,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//{ //{
// tn2.Expanded = true; // tn2.Expanded = true;
//} //}
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent= true; tn2.EnableClickEvent= true;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+4 -4
View File
@@ -102,11 +102,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
// var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId); // var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId);
//int a = NowComPipelineCode.Count(); //int a = NowComPipelineCode.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -135,7 +135,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
tn2.Expanded = true; tn2.Expanded = true;
} }
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent= true; tn2.EnableClickEvent= true;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+4 -4
View File
@@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "UnitWork"; tn1.CommandName = "UnitWork";
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
BindNodes(tn1); BindNodes(tn1);
@@ -92,11 +92,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "UnitWork"; tn2.CommandName = "UnitWork";
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
BindNodes(tn2); BindNodes(tn2);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+1 -1
View File
@@ -52,7 +52,7 @@
<f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号" <f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号"
ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true"> ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpUnit" Label="单位名称" runat="server" Readonly="true" <f:DropDownList ID="drpUnit" Label="单位名称" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right"> ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true" <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true"
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+2 -2
View File
@@ -72,8 +72,8 @@
<f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server" <f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true"> DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">
</f:DatePicker> </f:DatePicker>
<f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true"> <%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
</f:Button> </f:Button>--%>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click"> <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click">
</f:Button> </f:Button>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+59 -81
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").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01") && x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select x.TaskDate.Value.Date).Distinct().Count(); 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(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName; tn1.Text = q.UnitWorkName;
tn1.CommandName = "单位工程"; tn1.CommandName = "单位工程";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
@@ -149,7 +149,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
foreach (var q in unitWork2) 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 var a = (from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == q.UnitWorkId where x.UnitWorkId == q.UnitWorkId
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1) && 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.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName; tn2.Text = q.UnitWorkName;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
@@ -299,61 +299,61 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#endregion #endregion
#region 查找 //#region 查找
protected void ckSelect_Click(object sender, EventArgs e) //protected void ckSelect_Click(object sender, EventArgs e)
{ //{
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID); // var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w != null) // if (w != null)
{ // {
string UnitId = w.UnitId; // string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId; // string UnitWorkId = w.UnitWorkId;
string strList = UnitWorkId + "|" + UnitId; // string strList = UnitWorkId + "|" + UnitId;
string weldJointIds = hdItemsString.Text.Trim(); // 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; // 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; // this.hdTaskWeldJoint.Text = string.Empty;
if (task.Count() > 0) // if (task.Count() > 0)
{ // {
foreach (var item in task) // foreach (var item in task)
{ // {
this.hdTaskWeldJoint.Text += item.WeldJointId + "|"; // this.hdTaskWeldJoint.Text += item.WeldJointId + "|";
} // }
} // }
if (!string.IsNullOrEmpty(hdTaskWeldJoint.Text)) // if (!string.IsNullOrEmpty(hdTaskWeldJoint.Text))
{ // {
hdTaskWeldJoint.Text = hdTaskWeldJoint.Text.Substring(0, hdTaskWeldJoint.Text.Length - 1); // hdTaskWeldJoint.Text = hdTaskWeldJoint.Text.Substring(0, hdTaskWeldJoint.Text.Length - 1);
} // }
string TaskWeldJoints = hdTaskWeldJoint.Text.Trim();//任务表已存在的焊口 // string TaskWeldJoints = hdTaskWeldJoint.Text.Trim();//任务表已存在的焊口
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}&weldJointIds={1}&TaskWeldJoints={2}", strList, Server.UrlEncode(weldJointIds), Server.UrlEncode(TaskWeldJoints), "编辑 - "); // 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)); // PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID, hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window));
} // }
else // else
{ // {
Alert.ShowInTop("请选择单位和单位工程", MessageBoxIcon.Warning); // Alert.ShowInTop("请选择单位和单位工程", MessageBoxIcon.Warning);
} // }
} //}
protected void Window1_Close(object sender, WindowCloseEventArgs e) //protected void Window1_Close(object sender, WindowCloseEventArgs e)
{ //{
string str1 = hdItemsString.Text; // string str1 = hdItemsString.Text;
string str2 = hdTaskWeldJoint.Text; // string str2 = hdTaskWeldJoint.Text;
this.InitTreeMenu(); // this.InitTreeMenu();
var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID); // var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null; // List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (unit == null) // if (unit == null)
{ // {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim())); // GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
} // }
else // else
{ // {
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim())); // GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
} // }
this.BindGrid(GetWeldingTaskList); // this.BindGrid(GetWeldingTaskList);
} //}
#endregion //#endregion
#region 保存 #region 保存
protected void btnSave_Click(object sender, EventArgs e) 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(); Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask();
NewTask.ProjectId = this.CurrUser.LoginProjectId; NewTask.ProjectId = this.CurrUser.LoginProjectId;
NewTask.UnitWorkId = getUnit.UnitWorkId; NewTask.UnitWorkId = getUnit.UnitWorkId;
if (getUnit != null)
{
NewTask.UnitId = getUnit.UnitId;
}
NewTask.WeldTaskId = item.WeldTaskId; NewTask.WeldTaskId = item.WeldTaskId;
NewTask.WeldJointId = item.WeldJointId; NewTask.WeldJointId = item.WeldJointId;
NewTask.CoverWelderId = item.CoverWelderId; NewTask.CoverWelderId = item.CoverWelderId;
@@ -451,6 +446,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var i in Grid1.SelectedRowIndexArray) foreach (var i in Grid1.SelectedRowIndexArray)
{ {
string weldTaskId = Grid1.DataKeys[i][0].ToString(); string weldTaskId = Grid1.DataKeys[i][0].ToString();
var taskmodel = WeldTaskService.GetWeldTaskById(weldTaskId);
string unitId = taskmodel.UnitId;//获取任务单的单位
string jotId = Grid1.DataKeys[i][1].ToString(); string jotId = Grid1.DataKeys[i][1].ToString();
var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(jotId); var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(jotId);
var iso = BLL.PipelineService.GetPipelineByPipelineId(jot.PipelineId); var iso = BLL.PipelineService.GetPipelineByPipelineId(jot.PipelineId);
@@ -483,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string canWeldingWireName = string.Empty; string canWeldingWireName = string.Empty;
var projectWelder = from x in Funs.DB.SitePerson_Person var projectWelder = from x in Funs.DB.SitePerson_Person
where x.ProjectId == jot.ProjectId && x.States == Const.State_1 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 != "" && x.WelderCode != null && x.WelderCode != ""
select x; select x;
@@ -853,10 +850,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (w != null) if (w != null)
{ {
string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId; string UnitWorkId = w.UnitWorkId;
string taskDate = ""; string taskDate = "";
string strList = UnitWorkId + "|" + UnitId + "|" + taskDate; string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - "); string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window)); 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); var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNode.ParentNode.NodeID);
if (w != null) if (w != null)
{ {
string UnitId = w.UnitId;
string UnitWorkId = w.UnitWorkId; string UnitWorkId = w.UnitWorkId;
string taskDate = string.Empty; string taskDate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|")) if (tvControlItem.SelectedNodeID.Contains("|"))
@@ -884,7 +879,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
taskDate = tvControlItem.SelectedNodeID; taskDate = tvControlItem.SelectedNodeID;
} }
string strList = UnitWorkId + "|" + UnitId + "|" + taskDate; string strList = UnitWorkId + "|" + taskDate;
string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - "); string window = String.Format("SelectTaskWeldJoint.aspx?strList={0}", strList, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdTaskWeldJoint.ClientID) + Window1.GetShowReference(window)); 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)); List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
this.BindGrid(GetWeldingTaskList); 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;
//}
} }
} }
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs
Generated
+4 -11
View File
@@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldTask { public partial class WeldTask
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -183,15 +185,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtTaskDate; protected global::FineUIPro.DatePicker txtTaskDate;
/// <summary>
/// ckSelect 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button ckSelect;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+4 -4
View File
@@ -92,11 +92,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
} }
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableExpandEvent = true; tn1.EnableExpandEvent = true;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
@@ -134,7 +134,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
select x).Count(); select x).Count();
} }
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
@@ -142,7 +142,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//{ //{
// tn2.Expanded = true; // tn2.Expanded = true;
//} //}
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+4 -4
View File
@@ -84,11 +84,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork1) foreach (var q in unitWork1)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode(); TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId; tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + u.UnitName; tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true; tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1); rootNode1.Nodes.Add(tn1);
} }
@@ -98,11 +98,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork2) foreach (var q in unitWork2)
{ {
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode(); TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId; tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true; tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
} }
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
-65
View File
@@ -228,71 +228,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
} }
#endregion #endregion
/// <summary>
/// 发起设计交底(树节点)
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuAddTechnicalDisclose_Click(object sender, EventArgs e)
{
if (this.trWBS.SelectedNode != null)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.CQMSTechnicalDiscloseMenuId, BLL.Const.BtnAdd))
{
if (this.trWBS.SelectedNode.CommandName == "WorkPackage")
{
var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == this.trWBS.SelectedNodeID && x.IsApprove == true select x;
if (childWorkPackages.Count() == 0) //末级节点
{
var oldTechnicalDisclose = BLL.CQMS_TechnicalDiscloseService.GetTechnicalDiscloseByDataId(this.trWBS.SelectedNodeID);
if (oldTechnicalDisclose == null)
{
var unitWork = (from x in Funs.DB.WBS_UnitWork
join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId
where y.WorkPackageId == this.trWBS.SelectedNodeID
select x).FirstOrDefault();
Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
if (unitWork != null)
{
technicalDisclose.UnitId = unitWork.UnitId;
technicalDisclose.UnitWorkId = unitWork.UnitWorkId;
}
technicalDisclose.DataId = this.trWBS.SelectedNodeID;
technicalDisclose.DiscloseName = this.trWBS.SelectedNode.Text;
technicalDisclose.State = "0"; //未交底
technicalDisclose.CompileMan = this.CurrUser.PersonId;
technicalDisclose.CompileDate = DateTime.Now;
BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
ShowNotify("发起成功！", MessageBoxIcon.Success);
}
else
{
ShowNotify("该节点已发起设计交底！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请选择树节点！", MessageBoxIcon.Warning);
}
}
/// <summary> /// <summary>
/// 展开全部 /// 展开全部
/// </summary> /// </summary>
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx
+1 -1
View File
@@ -42,7 +42,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList runat="server" ID="drpUnit" Label="施工单位" LabelWidth="150px" ShowRedStar="true"></f:DropDownList> <f:DropDownList runat="server" ID="drpUnit" Label="施工单位" LabelWidth="150px" ShowRedStar="true" EnableCheckBoxSelect="True"></f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs
+2 -2
View File
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
} }
if (!string.IsNullOrEmpty(UnitWork.UnitId)) if (!string.IsNullOrEmpty(UnitWork.UnitId))
{ {
this.drpUnit.SelectedValue = UnitWork.UnitId; this.drpUnit.SelectedValueArray = UnitWork.UnitId.Split(',');
} }
if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId)) if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId))
{ {
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
UnitWork.UnitWorkName = this.txtUnitWorkName.Text.Trim(); UnitWork.UnitWorkName = this.txtUnitWorkName.Text.Trim();
if (this.drpUnit.SelectedValue != BLL.Const._Null) if (this.drpUnit.SelectedValue != BLL.Const._Null)
{ {
UnitWork.UnitId = this.drpUnit.SelectedValue; UnitWork.UnitId =string.Join(",", this.drpUnit.SelectedValueArray) ;
} }
else else
{ {
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
} }
if (!string.IsNullOrEmpty(UnitWork.UnitId)) if (!string.IsNullOrEmpty(UnitWork.UnitId))
{ {
this.txtUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.UnitId); this.txtUnit.Text = UnitService.getUnitNamesUnitIds(UnitWork.UnitId);
} }
if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId)) if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId))
{ {