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

2023-10-25

Browse Source
This commit is contained in:
李鹏飞
2023-10-25 19:44:10 +08:00
parent 127146e24a
commit fa939f60d3
66 changed files with 522 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
+6 -19
View File
@@ -77,32 +77,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = 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();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" 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();
if (unitWork1.Count() > 0)
{
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 u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode1.Nodes.Add(tn1);
BindNodes(tn1);
}
@@ -112,11 +99,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
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 u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode2.Nodes.Add(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 reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
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 reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
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 trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = reportItems.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
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 trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = reportItems.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
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">
</f:TextBox>
<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 ID="drpUnitWork" runat="server" Label="单位工程名称"
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))
{
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
if (w.UnitId != null)
{
drpHardTrustUnit.SelectedValue = w.UnitId;
}
if (w.NDEUnit != null)
{
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> 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
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
@@ -90,20 +91,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
}
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)
{
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 u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + u.UnitName;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode1.Nodes.Add(tn1);
BindNodes(tn1);
}
@@ -113,11 +113,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
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 u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
rootNode2.Nodes.Add(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 reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
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 reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList();
int num = trustItems.Count() - reportItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
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
select x).ToList();
int num = weldJoints.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
if (num > 0)
@@ -182,7 +181,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
where x.UnitWorkId == q.UnitWorkId
select x).ToList();
int num = weldJoints.Count() - trustItems.Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
if (num > 0)
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx
+1 -1
View File
@@ -51,7 +51,7 @@
LabelWidth="180px">
</f:DropDownList>
<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>
</Items>
</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))
{
var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId);
drpUnitId.SelectedValue = w.UnitId;
this.drpUnitWork.SelectedValue = w.UnitWorkId;
}