lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
高飞 2024-08-19 09:21:38 +08:00
parent 3550951075 012f59da32
commit d8438a5c76
57 changed files with 1382 additions and 839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/APIBaseInfoService.cs
View File

@ -106,7 +106,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var getDataLists = (from x in db.WBS_UnitWork var getDataLists = (from x in db.WBS_UnitWork
where x.ProjectId == projectId && x.UnitId == unitId && x.SuperUnitWork == null where x.ProjectId == projectId && x.UnitId == unitId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode orderby x.UnitWorkCode
select new Model.BaseInfoItem select new Model.BaseInfoItem
{ {

2
SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
View File

@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.Check
if (e.Node.CommandName == "ProjectType") //展开工程类型 if (e.Node.CommandName == "ProjectType") //展开工程类型
{ {
var trUnitWork = from x in Funs.DB.WBS_UnitWork var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == e.Node.NodeID
select x; select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0) if (trUnitWork.Count() > 0)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
View File

@ -169,7 +169,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
select x; select x;
var cns = from x in Funs.DB.Base_CNProfessional select x; var cns = from x in Funs.DB.Base_CNProfessional select x;
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 0; i < ir; i++) for (int i = 0; i < ir; i++)
{ {

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
View File

@ -171,7 +171,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
{ {
@ -428,7 +428,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork=="0")
select x; select x;
var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -429,7 +429,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
var posts = from x in Funs.DB.Base_Post select x; var posts = from x in Funs.DB.Base_Post select x;
@ -456,7 +456,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
var posts = from x in Funs.DB.Base_Post select x; var posts = from x in Funs.DB.Base_Post select x;

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -397,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
var users = from x in Funs.DB.Project_ProjectUser var users = from x in Funs.DB.Project_ProjectUser
@ -478,7 +478,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
var users = from x in Funs.DB.Project_ProjectUser var users = from x in Funs.DB.Project_ProjectUser

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
View File

@ -173,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -379,7 +379,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -407,7 +407,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x; select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)

7
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
View File

@ -166,7 +166,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == this.CurrUser.LoginProjectId && (y.UnitType == Const.ProjectUnitType_1 || y.UnitType == Const.ProjectUnitType_2) where y.ProjectId == this.CurrUser.LoginProjectId && (y.UnitType == Const.ProjectUnitType_1 || y.UnitType == Const.ProjectUnitType_2)
select x; select x;
var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x; var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x; var cns = from x in Funs.DB.Base_CNProfessional select x;
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -394,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
select x; select x;
var cns = from x in Funs.DB.Base_CNProfessional select x; var cns = from x in Funs.DB.Base_CNProfessional select x;
var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null select x; var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x;
var oldViewInfos = from x in Funs.DB.Comprehensive_SiteVisaManagement var oldViewInfos = from x in Funs.DB.Comprehensive_SiteVisaManagement
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
select x; select x;

4
SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx
View File

@ -14,8 +14,8 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="质量管理制度" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange" <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="质量管理制度" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
runat="server" BoxFlex="1" DataKeyNames="QualityManagementSysId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="QualityManagementSysId" AllowSorting="true" SortField="ApprovalDate" runat="server" BoxFlex="1" DataKeyNames="QualityManagementSysId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="QualityManagementSysId" AllowSorting="true" SortField="FileCode"
SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" SortDirection="ASC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"> EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars> <Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">

2
SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs
View File

@ -224,7 +224,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
{ {
lists = lists.Where(x => x.FileName.Contains(this.txtFileName.Text.Trim())); lists = lists.Where(x => x.FileName.Contains(this.txtFileName.Text.Trim()));
} }
lists = lists.OrderByDescending(x => x.ApprovalDate); lists = lists.OrderBy(x => x.FileCode);
if (lists != null) if (lists != null)
{ {
string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);

4
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
View File

@ -121,7 +121,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (e.Node.CommandName == "ProjectType") //展开工程类型 if (e.Node.CommandName == "ProjectType") //展开工程类型
{ {
var trUnitWork = from x in Funs.DB.WBS_UnitWork var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x; select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0) if (trUnitWork.Count() > 0)
@ -1033,7 +1033,7 @@ namespace FineUIPro.Web.CQMS.WBS
{ {
rootNode.Expanded = true; rootNode.Expanded = true;
var trUnitWork = from x in Funs.DB.WBS_UnitWork var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == projectType where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == projectType
select x; select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0) if (trUnitWork.Count() > 0)

2
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
View File

@ -120,7 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (e.Node.CommandName == "ProjectType") //展开工程类型 if (e.Node.CommandName == "ProjectType") //展开工程类型
{ {
var trUnitWork = from x in Funs.DB.WBS_UnitWork var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x; select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0) if (trUnitWork.Count() > 0)

6
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
View File

@ -87,7 +87,11 @@ namespace FineUIPro.Web.CQMS.WBS
this.trWBS.AutoScroll = true; this.trWBS.AutoScroll = true;
this.trWBS.EnableSingleClickExpand = true; this.trWBS.EnableSingleClickExpand = true;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
foreach (var q in unitWorks) foreach (var q in unitWorks)
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();

6
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
View File

@ -79,7 +79,11 @@ namespace FineUIPro.Web.CQMS.WBS
this.trWBS.EnableIcons = true; this.trWBS.EnableIcons = true;
this.trWBS.AutoScroll = true; this.trWBS.AutoScroll = true;
this.trWBS.EnableSingleClickExpand = true; this.trWBS.EnableSingleClickExpand = true;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
foreach (var q in unitWorks) foreach (var q in unitWorks)
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
View File

@ -70,7 +70,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
View File

@ -74,7 +74,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
View File

@ -73,7 +73,7 @@ namespace FineUIPro.Web.HJGL.NDT
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
View File

@ -48,7 +48,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaningLists = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_PC_PurgingCleaning> PurgingCleaningLists = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList(); List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
View File

@ -117,7 +117,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
View File

@ -90,7 +90,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime

2
SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
View File

@ -88,7 +88,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();

32
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
View File

@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
@ -283,34 +283,44 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (!string.IsNullOrEmpty(testPackageManage.Check2)) if (!string.IsNullOrEmpty(testPackageManage.Check2))
{ {
drpPressureTest.SelectedValue = testPackageManage.Check2; drpPressureTest.SelectedValue = testPackageManage.Check2;
} if (!string.IsNullOrEmpty(testPackageManage.Check3)) }
if (!string.IsNullOrEmpty(testPackageManage.Check3))
{ {
drpWorkRecord.SelectedValue = testPackageManage.Check3; drpWorkRecord.SelectedValue = testPackageManage.Check3;
} if (!string.IsNullOrEmpty(testPackageManage.Check4)) }
if (!string.IsNullOrEmpty(testPackageManage.Check4))
{ {
drpNDTConform.SelectedValue = testPackageManage.Check4; drpNDTConform.SelectedValue = testPackageManage.Check4;
} if (!string.IsNullOrEmpty(testPackageManage.Check5)) }
if (!string.IsNullOrEmpty(testPackageManage.Check5))
{ {
drpHotConform.SelectedValue = testPackageManage.Check5; drpHotConform.SelectedValue = testPackageManage.Check5;
} if (!string.IsNullOrEmpty(testPackageManage.Check6)) }
if (!string.IsNullOrEmpty(testPackageManage.Check6))
{ {
drpInstallationCorrectness.SelectedValue = testPackageManage.Check6; drpInstallationCorrectness.SelectedValue = testPackageManage.Check6;
} if (!string.IsNullOrEmpty(testPackageManage.Check7)) }
if (!string.IsNullOrEmpty(testPackageManage.Check7))
{ {
drpMarkClearly.SelectedValue = testPackageManage.Check7; drpMarkClearly.SelectedValue = testPackageManage.Check7;
} if (!string.IsNullOrEmpty(testPackageManage.Check8)) }
if (!string.IsNullOrEmpty(testPackageManage.Check8))
{ {
drpIsolationOpening.SelectedValue = testPackageManage.Check8; drpIsolationOpening.SelectedValue = testPackageManage.Check8;
} if (!string.IsNullOrEmpty(testPackageManage.Check9)) }
if (!string.IsNullOrEmpty(testPackageManage.Check9))
{ {
drpConstructionPlanAsk.SelectedValue = testPackageManage.Check9; drpConstructionPlanAsk.SelectedValue = testPackageManage.Check9;
} if (!string.IsNullOrEmpty(testPackageManage.Check10)) }
if (!string.IsNullOrEmpty(testPackageManage.Check10))
{ {
drpCover.SelectedValue = testPackageManage.Check10; drpCover.SelectedValue = testPackageManage.Check10;
} if (!string.IsNullOrEmpty(testPackageManage.Check11)) }
if (!string.IsNullOrEmpty(testPackageManage.Check11))
{ {
drpMeetRequirements.SelectedValue = testPackageManage.Check11; drpMeetRequirements.SelectedValue = testPackageManage.Check11;
} if (!string.IsNullOrEmpty(testPackageManage.Check12)) }
if (!string.IsNullOrEmpty(testPackageManage.Check12))
{ {
drpStainlessTestWater.SelectedValue = testPackageManage.Check12; drpStainlessTestWater.SelectedValue = testPackageManage.Check12;
} }

111
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
View File

@ -1,4 +1,16 @@
using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Linq; using BLL; using Newtonsoft.Json.Linq; namespace FineUIPro.Web.HJGL.TestPackage { public partial class TestPackageComplete : PageBase { #region 定义项 using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using BLL;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageComplete : PageBase
{
#region 定义项
/// <summary> /// <summary>
/// 试压包主键 /// 试压包主键
/// </summary> /// </summary>
@ -14,7 +26,25 @@
} }
} }
#endregion #endregion
#region 加载页面 /// <summary> /// 加载页面 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.PTP_ID = string.Empty; this.InitTreeMenu();//加载树 } } #endregion #region 加载树装置-单位-工作区
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.PTP_ID = string.Empty;
this.InitTreeMenu();//加载树
}
}
#endregion
#region 加载树装置-单位-工作区
/// <summary> /// <summary>
/// 加载树 /// 加载树
/// </summary> /// </summary>
@ -40,7 +70,7 @@
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
@ -97,7 +127,9 @@
} }
} }
} }
#endregion #region 绑定树节点 #endregion
#region 绑定树节点
/// <summary> /// <summary>
/// 绑定树节点 /// 绑定树节点
/// </summary> /// </summary>
@ -150,6 +182,7 @@
} }
#endregion #endregion
#region 数据绑定 #region 数据绑定
/// <summary> /// <summary>
/// 数据绑定 /// 数据绑定
@ -212,13 +245,79 @@
} }
#endregion #endregion
#endregion #endregion
#region 分页排序 #region 分页排序
#region 页索引改变事件 /// <summary> /// 页索引改变事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { BindGrid(); } #endregion #region 排序 /// <summary> /// 排序 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_Sort(object sender, GridSortEventArgs e) { BindGrid(); } #endregion #region 分页选择下拉改变事件 /// <summary> /// 分页选择下拉改变事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } #endregion #endregion #region 关闭弹出窗口及刷新页面 /// <summary> /// 关闭弹出窗口 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Window1_Close(object sender, WindowCloseEventArgs e) { this.PTP_ID = this.hdPTP_ID.Text; this.BindGrid(); this.InitTreeMenu(); this.hdPTP_ID.Text = string.Empty; } /// <summary> /// 查询 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Tree_TextChanged(object sender, EventArgs e) { this.InitTreeMenu(); this.BindGrid(); }
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
#endregion
#region 关闭弹出窗口及刷新页面
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
this.PTP_ID = this.hdPTP_ID.Text;
this.BindGrid();
this.InitTreeMenu();
this.hdPTP_ID.Text = string.Empty;
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Tree_TextChanged(object sender, EventArgs e)
{
this.InitTreeMenu();
this.BindGrid();
}
#endregion #endregion
protected void btnMenuModify_Click(object sender, EventArgs e) protected void btnMenuModify_Click(object sender, EventArgs e)
{ {
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID)+ Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - "))); PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID)+ Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - ")));
} }
} } }
}

2
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
View File

@ -73,7 +73,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
View File

@ -57,7 +57,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
View File

@ -47,7 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
View File

@ -58,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -64,7 +64,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList(); select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null; List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
View File

@ -293,7 +293,7 @@ namespace FineUIPro.Web.HSSE.Check
{ {
string info = string.Empty; string info = string.Empty;
var unitWorks = from x in Funs.DB.WBS_UnitWork var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId && x.SuperUnitWork == null where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode orderby x.UnitWorkCode
select new select new
{ {

2
SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs
View File

@ -117,7 +117,7 @@ namespace FineUIPro.Web.JDGL.Check
if (e.Node.CommandName == "ProjectType") //展开工程类型 if (e.Node.CommandName == "ProjectType") //展开工程类型
{ {
var trUnitWork = from x in Funs.DB.WBS_UnitWork var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x; select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0) if (trUnitWork.Count() > 0)

6
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
View File

@ -48,7 +48,7 @@
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center"> TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label> <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String" <f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
@ -77,13 +77,13 @@
</f:TemplateField> </f:TemplateField>
<f:TemplateField ColumnID="tfSubcontractor" Width="400px" HeaderText="施工分包商" HeaderTextAlign="Center" TextAlign="Left"> <f:TemplateField ColumnID="tfSubcontractor" Width="400px" HeaderText="施工分包商" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertSubcontractor(Eval("ProjectId")) %>' <asp:Label ID="lblSubcontractor" runat="server" Text='<%# ConvertSubcontractor(Eval("ProjectId")) %>'
ToolTip='<%# ConvertSubcontractor(Eval("ProjectId")) %>'></asp:Label> ToolTip='<%# ConvertSubcontractor(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:TemplateField ColumnID="tfOwn" Width="150px" HeaderText="建设单位" HeaderTextAlign="Center" TextAlign="Left"> <f:TemplateField ColumnID="tfOwn" Width="150px" HeaderText="建设单位" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertOwn(Eval("ProjectId")) %>' <asp:Label ID="lblOwn" runat="server" Text='<%# ConvertOwn(Eval("ProjectId")) %>'
ToolTip='<%# ConvertOwn(Eval("ProjectId")) %>'></asp:Label> ToolTip='<%# ConvertOwn(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>

12
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.IO;
using System.Linq; using System.Linq;
namespace FineUIPro.Web.ProjectData namespace FineUIPro.Web.ProjectData
@ -102,6 +103,7 @@ namespace FineUIPro.Web.ProjectData
} }
#endregion #endregion
#region 双击行事件
/// <summary> /// <summary>
/// 双击事件 /// 双击事件
/// </summary> /// </summary>
@ -116,7 +118,9 @@ namespace FineUIPro.Web.ProjectData
} }
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - ")));
} }
#endregion
#region 查看
/// <summary> /// <summary>
/// 查看 /// 查看
/// </summary> /// </summary>
@ -126,6 +130,7 @@ namespace FineUIPro.Web.ProjectData
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - ")));
} }
#endregion
#region 获取按钮权限 #region 获取按钮权限
/// <summary> /// <summary>
@ -204,12 +209,9 @@ namespace FineUIPro.Web.ProjectData
protected void btnOut_Click(object sender, EventArgs e) protected void btnOut_Click(object sender, EventArgs e)
{ {
Response.ClearContent(); Response.ClearContent();
string filename = Funs.GetNewFileName(); Response.AddHeader("content-disposition", "attachment; filename=项目信息.xls");
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("项目信息" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/vnd.ms-excel";
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8; Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1)); Response.Write(GetGridTableHtml(Grid1));
Response.End(); Response.End();
} }

12
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs generated
View File

@ -85,13 +85,13 @@ namespace FineUIPro.Web.ProjectData {
protected global::FineUIPro.Button btnOut; protected global::FineUIPro.Button btnOut;
/// <summary> /// <summary>
/// lblNumber 控件。 /// labNumber 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber; protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary> /// <summary>
/// lblCM 控件。 /// lblCM 控件。
@ -103,22 +103,22 @@ namespace FineUIPro.Web.ProjectData {
protected global::System.Web.UI.WebControls.Label lblCM; protected global::System.Web.UI.WebControls.Label lblCM;
/// <summary> /// <summary>
/// Label1 控件。 /// lblSubcontractor 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label Label1; protected global::System.Web.UI.WebControls.Label lblSubcontractor;
/// <summary> /// <summary>
/// Label2 控件。 /// lblOwn 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label Label2; protected global::System.Web.UI.WebControls.Label lblOwn;
/// <summary> /// <summary>
/// ToolbarSeparator1 控件。 /// ToolbarSeparator1 控件。

2
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
View File

@ -37,7 +37,7 @@ namespace FineUIPro.Web.ProjectData
BLL.WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true); BLL.WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true); CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true); CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
gvUnitWork.DataSource = (from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == null && x.ProjectId == this.CurrUser.LoginProjectId select x); gvUnitWork.DataSource = (from x in Funs.DB.WBS_UnitWork where (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectId == this.CurrUser.LoginProjectId select x);
gvUnitWork.DataBind(); gvUnitWork.DataBind();
this.ProjectUserId = Request.QueryString["ProjectUserId"]; this.ProjectUserId = Request.QueryString["ProjectUserId"];
if (!String.IsNullOrEmpty(this.ProjectUserId)) if (!String.IsNullOrEmpty(this.ProjectUserId))

497
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs
View File

@ -1,5 +1,10 @@
using BLL; using BLL;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ProjectData namespace FineUIPro.Web.ProjectData
{ {
@ -74,14 +79,13 @@ namespace FineUIPro.Web.ProjectData
newUnitWork.UnitWorkId = id; newUnitWork.UnitWorkId = id;
BLL.UnitWorkService.UpdateUnitWork(newUnitWork); BLL.UnitWorkService.UpdateUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改子单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改子单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
} }
else else
{ {
newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork)); newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork));
BLL.UnitWorkService.AddUnitWork(newUnitWork); BLL.UnitWorkService.AddUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加子单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加子单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); //PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newUnitWork.UnitWorkId) + ActiveWindow.GetHidePostBackReference());
} }
} }
else else
@ -96,14 +100,204 @@ namespace FineUIPro.Web.ProjectData
newUnitWork.UnitWorkId = id; newUnitWork.UnitWorkId = id;
BLL.UnitWorkService.UpdateUnitWork(newUnitWork); BLL.UnitWorkService.UpdateUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
var divisionProject = Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.UnitWorkId == newUnitWork.UnitWorkId);
if (divisionProject == null)
{
#region 拷贝WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
newDivisionProject.SubItemType = d1.SubItemType;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
}
}
//拷贝分项
var breakdowns = from x in Funs.DB.WBS_Breakdown select x;
foreach (var b in breakdowns)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = this.CurrUser.LoginProjectId;
bp.BreakdownCode = b.BreakdownCode;
bp.BreakdownName = b.BreakdownName;
bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
bp.Basis = b.Basis;
bp.CheckPoints = b.CheckPoints;
bp.RecordAndCode = b.RecordAndCode;
bp.Class = b.Class;
bp.SortIndex = b.SortIndex;
bp.Remark = b.Remark;
bp.ModelURL = b.ModelURL;
bp.UnitWorkId = newUnitWork.UnitWorkId;
bp.IsAcceptance = b.IsAcceptance;
bp.IsYellow = b.IsYellow;
bp.WuHuan = b.WuHuan;
bp.JianLi = b.JianLi;
bp.FenBao = b.FenBao;
bp.YeZhu = b.YeZhu;
bp.SourceBreakdownId = b.BreakdownId;
bp.CheckAcceptType = b.CheckAcceptType;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
#endregion
}
else
{
#region 拷贝建筑工程WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null && x.CNProfessionalId == BLL.Const.CNProfessionalConstructId select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
}
}
//拷贝分项
var breakdowns = from x in Funs.DB.WBS_Breakdown
join y in Funs.DB.WBS_Division on x.DivisionId equals y.DivisionId
where y.CNProfessionalId == BLL.Const.CNProfessionalConstructId
select x;
foreach (var b in breakdowns)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = this.CurrUser.LoginProjectId;
bp.BreakdownCode = b.BreakdownCode;
bp.BreakdownName = b.BreakdownName;
bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
bp.Basis = b.Basis;
bp.CheckPoints = b.CheckPoints;
bp.RecordAndCode = b.RecordAndCode;
bp.Class = b.Class;
bp.SortIndex = b.SortIndex;
bp.Remark = b.Remark;
bp.ModelURL = b.ModelURL;
bp.UnitWorkId = newUnitWork.UnitWorkId;
bp.IsAcceptance = b.IsAcceptance;
bp.IsYellow = b.IsYellow;
bp.WuHuan = b.WuHuan;
bp.JianLi = b.JianLi;
bp.FenBao = b.FenBao;
bp.YeZhu = b.YeZhu;
bp.SourceBreakdownId = b.BreakdownId;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
#endregion
}
Model.DataBase_DataTypeProject dp = Funs.DB.DataBase_DataTypeProject.FirstOrDefault(x => x.UnitWorkId == newUnitWork.UnitWorkId);
if (dp == null)
{
#region 拷贝资料库内容
Model.DataBase_DataTypeProject dataTypeProject = BLL.DataTypeProjectService.GetDataTypeProjectBySourceDataTypeId(Const.DataTypeNewConstructId, this.CurrUser.LoginProjectId);
List<Model.DataBase_DataType> childDataTypes = BLL.DataTypeService.GetDataTypesBySuperDataTypeId(Const.DataTypeNewConstructId);
if (childDataTypes.Count > 0)
{
if (dataTypeProject != null)
{
InsertDataTypeDetail(childDataTypes, dataTypeProject.DataTypeProjectId, this.CurrUser.LoginProjectId, newUnitWork.UnitWorkId);
}
}
#endregion
}
} }
else else
{ {
newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork)); newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork));
BLL.UnitWorkService.AddUnitWork(newUnitWork); BLL.UnitWorkService.AddUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); //PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newUnitWork.UnitWorkId) + ActiveWindow.GetHidePostBackReference()); #region 拷贝WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
}
}
//拷贝分项
var breakdowns = from x in Funs.DB.WBS_Breakdown select x;
foreach (var b in breakdowns)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = this.CurrUser.LoginProjectId;
bp.BreakdownCode = b.BreakdownCode;
bp.BreakdownName = b.BreakdownName;
bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
bp.Basis = b.Basis;
bp.CheckPoints = b.CheckPoints;
bp.RecordAndCode = b.RecordAndCode;
bp.Class = b.Class;
bp.SortIndex = b.SortIndex;
bp.Remark = b.Remark;
bp.ModelURL = b.ModelURL;
bp.UnitWorkId = newUnitWork.UnitWorkId;
bp.IsAcceptance = b.IsAcceptance;
bp.IsYellow = b.IsYellow;
bp.WuHuan = b.WuHuan;
bp.JianLi = b.JianLi;
bp.FenBao = b.FenBao;
bp.YeZhu = b.YeZhu;
bp.SourceBreakdownId = b.BreakdownId;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
#endregion
#region 拷贝资料库内容
Model.DataBase_DataTypeProject dataTypeProject = BLL.DataTypeProjectService.GetDataTypeProjectBySourceDataTypeId(Const.DataTypeNewConstructId, this.CurrUser.LoginProjectId);
List<Model.DataBase_DataType> childDataTypes = BLL.DataTypeService.GetDataTypesBySuperDataTypeId(Const.DataTypeNewConstructId);
if (childDataTypes.Count > 0)
{
if (dataTypeProject != null)
{
InsertDataTypeDetail(childDataTypes, dataTypeProject.DataTypeProjectId, this.CurrUser.LoginProjectId, newUnitWork.UnitWorkId);
}
}
#endregion
} }
} }
} }
@ -119,57 +313,270 @@ namespace FineUIPro.Web.ProjectData
newUnitWork.UnitWorkId = id; newUnitWork.UnitWorkId = id;
BLL.UnitWorkService.UpdateUnitWork(newUnitWork); BLL.UnitWorkService.UpdateUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
var divisionProject = Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.UnitWorkId == newUnitWork.UnitWorkId);
if (divisionProject == null)
{
#region 拷贝WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
newDivisionProject.SubItemType = d1.SubItemType;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
}
}
//拷贝分项
var breakdowns = from x in Funs.DB.WBS_Breakdown select x;
foreach (var b in breakdowns)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = this.CurrUser.LoginProjectId;
bp.BreakdownCode = b.BreakdownCode;
bp.BreakdownName = b.BreakdownName;
bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
bp.Basis = b.Basis;
bp.CheckPoints = b.CheckPoints;
bp.RecordAndCode = b.RecordAndCode;
bp.Class = b.Class;
bp.SortIndex = b.SortIndex;
bp.Remark = b.Remark;
bp.ModelURL = b.ModelURL;
bp.UnitWorkId = newUnitWork.UnitWorkId;
bp.IsAcceptance = b.IsAcceptance;
bp.IsYellow = b.IsYellow;
bp.WuHuan = b.WuHuan;
bp.JianLi = b.JianLi;
bp.FenBao = b.FenBao;
bp.YeZhu = b.YeZhu;
bp.SourceBreakdownId = b.BreakdownId;
bp.CheckAcceptType = b.CheckAcceptType;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
#endregion
}
else
{
#region 拷贝建筑工程WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null && x.CNProfessionalId == BLL.Const.CNProfessionalConstructId select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
}
}
//拷贝分项
var breakdowns = from x in Funs.DB.WBS_Breakdown
join y in Funs.DB.WBS_Division on x.DivisionId equals y.DivisionId
where y.CNProfessionalId == BLL.Const.CNProfessionalConstructId
select x;
foreach (var b in breakdowns)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = this.CurrUser.LoginProjectId;
bp.BreakdownCode = b.BreakdownCode;
bp.BreakdownName = b.BreakdownName;
bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
bp.Basis = b.Basis;
bp.CheckPoints = b.CheckPoints;
bp.RecordAndCode = b.RecordAndCode;
bp.Class = b.Class;
bp.SortIndex = b.SortIndex;
bp.Remark = b.Remark;
bp.ModelURL = b.ModelURL;
bp.UnitWorkId = newUnitWork.UnitWorkId;
bp.IsAcceptance = b.IsAcceptance;
bp.IsYellow = b.IsYellow;
bp.WuHuan = b.WuHuan;
bp.JianLi = b.JianLi;
bp.FenBao = b.FenBao;
bp.YeZhu = b.YeZhu;
bp.SourceBreakdownId = b.BreakdownId;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
#endregion
}
Model.DataBase_DataTypeProject dp = Funs.DB.DataBase_DataTypeProject.FirstOrDefault(x => x.UnitWorkId == newUnitWork.UnitWorkId);
if (dp == null)
{
#region 拷贝资料库内容
Model.DataBase_DataTypeProject dataTypeProject = BLL.DataTypeProjectService.GetDataTypeProjectBySourceDataTypeId(Const.DataTypeNewConstructId, this.CurrUser.LoginProjectId);
List<Model.DataBase_DataType> childDataTypes = BLL.DataTypeService.GetDataTypesBySuperDataTypeId(Const.DataTypeNewConstructId);
if (childDataTypes.Count > 0)
{
if (dataTypeProject != null)
{
InsertDataTypeDetail(childDataTypes, dataTypeProject.DataTypeProjectId, this.CurrUser.LoginProjectId, newUnitWork.UnitWorkId);
}
}
#endregion
}
} }
else else
{ {
newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork)); newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork));
BLL.UnitWorkService.AddUnitWork(newUnitWork); BLL.UnitWorkService.AddUnitWork(newUnitWork);
BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加单位工程！"); BLL.LogService.AddSys_Log(this.CurrUser, newUnitWork.UnitWorkId, newUnitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加单位工程！");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());//PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newUnitWork.UnitWorkId) + ActiveWindow.GetHidePostBackReference()); #region 拷贝WBS内容
//拷贝分部及子分部
var divisions1 = from x in Funs.DB.WBS_Division where x.SuperDivisionId == null select x;
foreach (var d1 in divisions1)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d1.DivisionCode;
newDivisionProject.DivisionName = d1.DivisionName;
newDivisionProject.SortIndex = d1.SortIndex;
newDivisionProject.SuperDivisionId = d1.SuperDivisionId;
newDivisionProject.CNProfessionalId = d1.CNProfessionalId;
newDivisionProject.UnitWorkId = newUnitWork.UnitWorkId;
newDivisionProject.OldDivisionId = d1.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, newUnitWork.UnitWorkId);
} }
} }
//string projectId = string.Empty; //拷贝分项
//string superUnitWorkId = string.Empty; var breakdowns = from x in Funs.DB.WBS_Breakdown select x;
//Model.WBS_UnitWork unitWork = new Model.WBS_UnitWork(); foreach (var b in breakdowns)
//Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(superId); {
//Model.WBS_UnitWork parUnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(superId); Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
//if (project != null) bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
//{ bp.ProjectId = this.CurrUser.LoginProjectId;
// projectId = project.ProjectId; bp.BreakdownCode = b.BreakdownCode;
// superUnitWorkId = "0"; bp.BreakdownName = b.BreakdownName;
// unitWork.UnitWorkCode = txtSupUnitWorkCode.Text.Trim(); bp.DivisionProjectId = (from x in Funs.DB.WBS_DivisionProject where x.OldDivisionId == b.DivisionId && x.UnitWorkId == newUnitWork.UnitWorkId select x.DivisionProjectId).FirstOrDefault();
// unitWork.UnitWorkName = txtSupUnitWorkName.Text.Trim(); bp.Basis = b.Basis;
// unitWork.SuperUnitWork = superUnitWorkId; bp.CheckPoints = b.CheckPoints;
//} bp.RecordAndCode = b.RecordAndCode;
//else if (parUnitWork != null) bp.Class = b.Class;
//{ bp.SortIndex = b.SortIndex;
// projectId = parUnitWork.ProjectId; bp.Remark = b.Remark;
// superUnitWorkId = superId; bp.ModelURL = b.ModelURL;
// unitWork.UnitWorkCode = txtUnitWorkCode.Text.Trim(); bp.UnitWorkId = newUnitWork.UnitWorkId;
// unitWork.UnitWorkName = txtUnitWorkName.Text.Trim(); bp.IsAcceptance = b.IsAcceptance;
// unitWork.SuperUnitWork = superUnitWorkId; bp.IsYellow = b.IsYellow;
//} bp.WuHuan = b.WuHuan;
//unitWork.ProjectId = projectId; bp.JianLi = b.JianLi;
//if (string.IsNullOrEmpty(id)) bp.FenBao = b.FenBao;
//{ bp.YeZhu = b.YeZhu;
// unitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork)); bp.SourceBreakdownId = b.BreakdownId;
// BLL.UnitWorkService.AddUnitWork(unitWork);
// BLL.LogService.AddSys_Log(this.CurrUser, unitWork.UnitWorkId, unitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "增加单位工程！"); BLL.BreakdownProjectService.AddBreakdownProject(bp);
// PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(unitWork.UnitWorkId) + ActiveWindow.GetHidePostBackReference()); }
//} #endregion
//else #region 拷贝资料库内容
//{ Model.DataBase_DataTypeProject dataTypeProject = BLL.DataTypeProjectService.GetDataTypeProjectBySourceDataTypeId(Const.DataTypeNewConstructId, this.CurrUser.LoginProjectId);
// Model.WBS_UnitWork unitWork1 = BLL.UnitWorkService.getUnitWorkByUnitWorkId(id); List<Model.DataBase_DataType> childDataTypes = BLL.DataTypeService.GetDataTypesBySuperDataTypeId(Const.DataTypeNewConstructId);
// unitWork.UnitWorkId = id; if (childDataTypes.Count > 0)
// unitWork.ProjectId = unitWork1.ProjectId; {
// unitWork.SuperUnitWork = unitWork1.SuperUnitWork; if (dataTypeProject != null)
// BLL.UnitWorkService.UpdateUnitWork(unitWork); {
InsertDataTypeDetail(childDataTypes, dataTypeProject.DataTypeProjectId, this.CurrUser.LoginProjectId, newUnitWork.UnitWorkId);
}
}
#endregion
}
}
// BLL.LogService.AddSys_Log(this.CurrUser, unitWork.UnitWorkId, unitWork.UnitWorkId, BLL.Const.UnitWorkMenuId, "修改单位工程！"); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); }
//}
/// <summary>
/// 循环拷贝子级分部
/// </summary>
/// <param name="dataTypes"></param>
private void InsertDivisionDetail(List<Model.WBS_Division> divisions, string superDivisionId, string unitWorkId)
{
foreach (var d in divisions)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
newDivisionProject.ProjectId = this.CurrUser.LoginProjectId;
newDivisionProject.DivisionCode = d.DivisionCode;
newDivisionProject.DivisionName = d.DivisionName;
newDivisionProject.SortIndex = d.SortIndex;
newDivisionProject.SuperDivisionId = superDivisionId;
newDivisionProject.CNProfessionalId = d.CNProfessionalId;
newDivisionProject.UnitWorkId = unitWorkId;
newDivisionProject.OldDivisionId = d.DivisionId;
newDivisionProject.SubItemType = d.SubItemType;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //子级分部
List<Model.WBS_Division> divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d.DivisionId select x).ToList();
if (divisions2.Count() > 0)
{
this.InsertDivisionDetail(divisions2, newDivisionProject.DivisionProjectId, unitWorkId);
}
}
}
/// <summary>
/// 循环拷贝子级类别
/// </summary>
/// <param name="dataTypes"></param>
private void InsertDataTypeDetail(List<Model.DataBase_DataType> dataTypes, string superDataTypeId, string projectId, string unitWorkId)
{
foreach (var d in dataTypes)
{
Model.DataBase_DataTypeProject newDataTypeProject = new Model.DataBase_DataTypeProject();
newDataTypeProject.DataTypeProjectId = SQLHelper.GetNewID(typeof(Model.DataBase_DataTypeProject));
newDataTypeProject.ProjectId = projectId;
newDataTypeProject.DataTypeCode = d.DataTypeCode;
newDataTypeProject.DataTypeName = d.DataTypeName;
newDataTypeProject.SuperDataTypeId = superDataTypeId;
newDataTypeProject.SortIndex = d.SortIndex;
newDataTypeProject.Pages = d.Pages;
newDataTypeProject.Remark = d.Remark;
newDataTypeProject.IsRelatedWBS = d.IsRelatedWBS;
newDataTypeProject.SourceDataTypeId = d.DataTypeId;
newDataTypeProject.UnitWorkId = unitWorkId;
BLL.DataTypeProjectService.AddDataTypeProject(newDataTypeProject);
List<Model.DataBase_DataType> childDataTypes = BLL.DataTypeService.GetDataTypesBySuperDataTypeId(d.DataTypeId);
if (childDataTypes.Count > 0)
{
InsertDataTypeDetail(childDataTypes, newDataTypeProject.DataTypeProjectId, projectId, unitWorkId);
}
}
} }
} }
} }

2
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>--> <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/> <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

12
SGGL/FineUIPro.Web/common/PageBase.cs
View File

@ -1012,6 +1012,18 @@ namespace FineUIPro.Web
{ {
html = (row.FindControl("lbCheckManNames") as AspNet.Label).Text; html = (row.FindControl("lbCheckManNames") as AspNet.Label).Text;
} }
if (column.ColumnID== "tfCM")
{
html = (row.FindControl("lblCM") as AspNet.Label).Text;
}
if (column.ColumnID == "tfSubcontractor")
{
html = (row.FindControl("lblSubcontractor") as AspNet.Label).Text;
}
if (column.ColumnID == "tfOwn")
{
html = (row.FindControl("lblOwn") as AspNet.Label).Text;
}
// 处理CheckBox // 处理CheckBox
if (html.Contains("f-grid-static-checkbox")) if (html.Contains("f-grid-static-checkbox"))
{ {