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-23 08:59:05 +08:00
parent 17d502e842 d12743d379
commit 640d07d964
14 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs
View File

@ -276,7 +276,7 @@ namespace BLL
}
else
{
List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();//装置条件为空时获取对应操作表中所有的装置
List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();//装置条件为空时获取对应操作表中所有的装置
foreach (Model.WBS_UnitWork item in InstallationList)
{
Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault();
@ -289,7 +289,7 @@ namespace BLL
}
else
{
List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId select x).ToList();
List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();
foreach (Model.WBS_UnitWork item in InstallationList)
{
Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault();

6
SGGL/BLL/ProjectData/UnitWorkService.cs
View File

@ -402,7 +402,7 @@ namespace BLL
string[] type = null;
if (!string.IsNullOrEmpty(projectType))
type = projectType.Split(',');
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x;
return unitWorks.ToList();
}
/// <summary>
@ -454,12 +454,12 @@ namespace BLL
{
if (ProjectType == "1")
{
List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
return lis;
}
else if (ProjectType == "2")
{
List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
return lis;
}
else

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -702,7 +702,7 @@ namespace BLL
public static int GetUnitProjectNum(string projectid)
{
int result = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == projectid
where x.ProjectId == projectid && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x).Count();
return result;
}

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

@ -388,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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;
var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder
where x.ProjectId == this.CurrUser.LoginProjectId
select x;

4
SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs
View File

@ -2287,7 +2287,7 @@ namespace FineUIPro.Web.CQMS.DataBase
private void WBSDataBind(string cNProfessionalCode)
{
this.tvWBS.Nodes.Clear();
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var installations = 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 installations)
{
TreeNode newNode = new TreeNode();
@ -2362,7 +2362,7 @@ namespace FineUIPro.Web.CQMS.DataBase
private void WBSDataBind2(string cNProfessionalCode)
{
this.tvWBS2.Nodes.Clear();
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var installations = 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 installations)
{
TreeNode newNode = new TreeNode();

2
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
this.tvControlItem.AutoScroll = true;
this.tvControlItem.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 item in unitWorks)
{
TreeNode rootNode1 = new TreeNode();

2
SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
this.tvControlItem.AutoScroll = true;
this.tvControlItem.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 item in unitWorks)
{
TreeNode rootNode1 = new TreeNode();

2
SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.trWBS.EnableIcons = true;
this.trWBS.AutoScroll = 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)
{
TreeNode newNode = new TreeNode();

14
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
View File

@ -25,6 +25,18 @@ namespace FineUIPro.Web.CQMS.WBS
ViewState["BreakdownProjectId"] = value;
}
}
public string UnitWorkId
{
get
{
return (string)ViewState["UnitWorkId"];
}
set
{
ViewState["UnitWorkId"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
@ -38,6 +50,7 @@ namespace FineUIPro.Web.CQMS.WBS
var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
if (division != null)
{
this.UnitWorkId = division.UnitWorkId;
if (division.CNProfessionalId != null && Const.CNProfessionalConstructId == division.CNProfessionalId)
{
this.tr1.Hidden = false;
@ -125,6 +138,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
}
newBreakdown.Remark = this.txtRemark.Text.Trim();
newBreakdown.UnitWorkId = this.UnitWorkId;
if (Request.Params["type"] == "add")
{
if (this.rblIsAcceptance.SelectedValue == "True")

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

@ -19232,7 +19232,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

4
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
View File

@ -198,7 +198,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
where x.ProjectId == this.ProjectId
select x;
var workAreas = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId
where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_WorkPost
select x;
@ -727,7 +727,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
where x.ProjectId == this.ProjectId
select x;
var workAreas = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId
where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_WorkPost
select x;

4
SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs
View File

@ -97,8 +97,8 @@ namespace FineUIPro.Web.ProjectData
if (e.Node.CommandName == "project") //展开项目节点
{
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == e.Node.NodeID && x.SuperUnitWork == "0"
orderby x.UnitWorkCode
where x.ProjectId == e.Node.NodeID && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
foreach (var unitWork in unitWorks)
{

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

@ -12,7 +12,7 @@
<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=.\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="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

4
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
View File

@ -392,9 +392,9 @@ namespace FineUIPro.Web
var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var TotalCheckDetailOKLists = from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
//join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
where y.ProjectId == this.CurrUser.LoginProjectId
select new { z.UnitWorkId, y.IsOnceQualified };
select new { x.UnitWorkId, y.IsOnceQualified };
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();