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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2023-08-31 11:02:48 +08:00
parent 0fc844f107 8e32d0d8ba
commit bc0f8129da
51 changed files with 1242 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
DataBase/版本日志/SGGLDB_V2023-08-30.sql Normal file
View File

@ -0,0 +1,124 @@
ALTER VIEW [dbo].[View_WBS]
AS
select '1' as Id,'0' as SupId ,'JZ' as Code, '建筑工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,
ProjectId from dbo.WBS_UnitWork
Union
select '2' as Id,'0' as SupId ,'AZ' as Code, '安装工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,
ProjectId from dbo.WBS_UnitWork
Union
select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,
ProjectId from dbo.WBS_UnitWork
Union all
select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
Union all
select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
GO
alter table WBS_UnitWork add WBSCode nvarchar(50) null
GO
alter table WBS_WorkPackage add WBSCode nvarchar(50) null
GO
alter table WBS_ControlItemAndCycle add WBSCode nvarchar(50) null
GO
ALTER VIEW [dbo].[View_WBS]
AS
select '1' as Id,'0' as SupId ,'JZ' as Code, '建筑工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as WBSCode,
ProjectId from dbo.WBS_UnitWork
Union
select '2' as Id,'0' as SupId ,'AZ' as Code, '安装工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as WBSCode,
ProjectId from dbo.WBS_UnitWork
Union
select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, WBSCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,WBSCode,
ProjectId from dbo.WBS_UnitWork
Union all
select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WBSCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,WBSCode,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
Union all
select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WBSCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,WBSCode,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
GO
update WBS_WorkPackage set PackageCode=(select PackageCode from WBS_WorkPackageInit w where w.WorkPackageCode=InitWorkPackageCode)
GO
alter table [dbo].[WBS_WorkPackageDetail] add PlanValue decimal(18,2) null
alter table [dbo].[WBS_WorkPackageDetail] add ThisValue decimal(18,2) null
alter table [dbo].[WBS_WorkPackageParentDetail] add PlanValue decimal(18,2) null
alter table [dbo].[WBS_WorkPackageParentDetail] add ThisValue decimal(18,2) null
GO
ALTER VIEW [dbo].[View_WBS_WorkPackageDetail]
AS
/********控制项明细********/
SELECT detail.WorkPackageDetailId,
detail.WorkPackageId,
detail.Months,
c.WorkPackageCode,
c.PackageContent,
c.ProjectId,
c.Unit, --单位
c.PlanProjectQuantity, --概算工作量
c.RealProjectQuantity, --实际工程量
CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanNum, --累计计划完成量
CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisNum, --累计完成量
CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanValue, --累计概算费用
CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisValue, --累计实际费用
CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --本月计划完成量
CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, --本月完成量
CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --本月概算费用
CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue --本月实际费用
FROM dbo.WBS_WorkPackageDetail AS detail
LEFT JOIN WBS_WorkPackage AS c ON c.WorkPackageId=detail.WorkPackageId
GO
ALTER VIEW [dbo].[View_WBS_WorkPackageParentDetail]
AS
/********控制项父级明细********/
SELECT detail.WorkPackageParentDetailId,
detail.ParentId,
detail.ProjectId,
detail.Months,
CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --本月计划完成量
CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, --本月实际完成量
CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --本月概算费用
CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue, --本月实际费用
CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanNum, --累计计划完成量
CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisNum, --累计完成量
CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanValue, --累计概算费用
CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisValue --累计实际费用
FROM dbo.WBS_WorkPackageParentDetail AS detail
GO

1
SGGL/BLL/BLL.csproj
View File

@ -41,6 +41,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS.ActiveMQ">

53
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
View File

@ -245,7 +245,7 @@ namespace BLL
/// 获取模拟树表格
/// </summary>
/// <returns></returns>
public static DataTable GetAllTreeDataTable(string projectId, string IsOut)
public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
@ -308,11 +308,11 @@ namespace BLL
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString());
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime);
}
else
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty);
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime);
}
a++;
}
@ -328,12 +328,12 @@ namespace BLL
if (item.WBSType == "WorkPackage")
{
var childWorkPackages = from x in workPackages where x.SuperWorkPackageId == item.Id && x.IsApprove == true select x;
if (childWorkPackages.Count() == 0)
var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id);
if (workPackage != null)
{
row[5] = item.Id;
var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id);
if (workPackage != null)
if (childWorkPackages.Count() == 0)
{
row[5] = item.Id;
if (workPackage.JDWeights != null)
{
row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2);
@ -386,6 +386,33 @@ namespace BLL
}
}
}
else
{
if (workPackage.JDWeights != null)
{
row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2);
}
if (workPackage.PlanStartDate != null)
{
row[10] = workPackage.PlanStartDate;
}
if (workPackage.PlanEndDate != null)
{
row[11] = workPackage.PlanEndDate;
}
if (workPackage.RealStartDate != null)
{
row[12] = workPackage.RealStartDate;
}
if (workPackage.RealEndDate != null)
{
row[13] = workPackage.RealEndDate;
}
if (workPackage.PlanCost != null)
{
row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2);
}
}
}
}
else if (item.WBSType == "UnitWork")
@ -427,29 +454,29 @@ namespace BLL
}
}
private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode)
private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string startTime, string endTime)
{
var items = oldList.Where(x => x.SupId == id).OrderBy(x => x.Code);
var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
int b = 1;
foreach (var item in items)
{
item.Code = preCode + "." + b.ToString();
newList.Add(item);
AddDetail(newList, oldList, item.Id, item.Code);
AddDetail(newList, oldList, item.Id, item.Code, startTime, endTime);
b++;
}
}
private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string prefix)
private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string prefix, string startTime, string endTime)
{
var items = oldList.Where(x => x.SupId == id).OrderBy(x => x.Code);
var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
int b = 1;
foreach (var item in items)
{
item.Code = preCode + "." + b.ToString();
item.Name = prefix + "...." + item.Name;
newList.Add(item);
AddDetail(newList, oldList, item.Id, item.Code, prefix + "....");
AddDetail(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime);
b++;
}
}

4
SGGL/BLL/Common/Const.cs
View File

@ -3293,6 +3293,10 @@ namespace BLL
/// </summary>
public const string WBSWorkPackageTemplateUrl = "File\\Excel\\DataIn\\WBS定制导入模板.xls";
/// <summary>
/// WBS编码规则
/// </summary>
public const string WBSCodeTemplateUrl = "File\\Excel\\DataIn\\WBS编码规则.xlsx";
/// <summary>
/// 管道等级导入模板
/// </summary>
public const string PipingClassTemplateUrl = "File\\Excel\\DataIn\\管道等级导入模板.xls";

2
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -94,7 +94,7 @@ namespace BLL
}
}
if (workPostIds.Count() > 0)
if (workPostIds != null && workPostIds.Count() > 0)
{
getDataList = getDataList.Where(e => workPostIds.Contains(e.WorkPostId));
}

14
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx
View File

@ -21,7 +21,7 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
@ -47,6 +47,18 @@
SortField="ControlItemAndCycleCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
ShowSelectedCell="true" DataIDField="ControlItemAndCycleId" AllowPaging="true" IsDatabasePaging="true"
PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnFile" ToolTip="生成项目WBS编码规则说明" Icon="Help" runat="server" Text=""
OnClick="btnFile_Click">
</f:Button>
<f:Button ID="btnCreateCode" ToolTip="生成项目WBS编码" Icon="Book" runat="server" Text=""
OnClick="btnCreateCode_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="70px" ColumnID="ControlItemContent" DataField="ControlItemContent" FieldType="String"
HeaderText="工作包" HeaderTextAlign="Center" TextAlign="Center">

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

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web.UI.WebControls;
@ -557,5 +558,103 @@ namespace FineUIPro.Web.CQMS.WBS
}
return s;
}
/// <summary>
/// 生成项目WBS编码
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnCreateCode_Click(object sender, EventArgs e)
{
Model.SGGLDB db = Funs.DB;
string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var workPackages = (from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
foreach (var unitWork in unitWorks)
{
unitWork.WBSCode = projectCode + unitWork.UnitWorkCode;
var workPackage1s = workPackages.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.SuperWorkPack == null).OrderBy(x => x.WorkPackageCode);
foreach (var workPackage1 in workPackage1s)
{
if (!workPackage1.PackageContent.Contains("-"))
{
workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode;
}
else
{
workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2);
}
UpdateWBSCode(db, workPackages, workPackage1.WorkPackageId, workPackage1.WBSCode, controlItemAndCycles);
}
}
db.SubmitChanges();
ShowNotify("生成成功！", MessageBoxIcon.Success);
}
private void UpdateWBSCode(Model.SGGLDB db, List<Model.WBS_WorkPackage> workPackages, string workPackageId, string wbsCode, List<Model.WBS_ControlItemAndCycle> controlItemAndCycles)
{
var childWorkPackages = workPackages.Where(x => x.SuperWorkPackageId == workPackageId);
if (childWorkPackages.Count() > 0)
{
foreach (var childWorkPackage in childWorkPackages)
{
if (!childWorkPackage.PackageContent.Contains("-"))
{
childWorkPackage.WBSCode = wbsCode + childWorkPackage.PackageCode;
}
else
{
childWorkPackage.WBSCode = wbsCode + childWorkPackage.PackageCode + childWorkPackage.WorkPackageCode.Substring(childWorkPackage.WorkPackageCode.Length - 2, 2);
}
UpdateWBSCode(db, workPackages, childWorkPackage.WorkPackageId, childWorkPackage.WBSCode, controlItemAndCycles);
}
}
else
{
var controlItemAndCycleItems = controlItemAndCycles.Where(x => x.WorkPackageId == workPackageId);
foreach (var controlItemAndCycleItem in controlItemAndCycleItems)
{
controlItemAndCycleItem.WBSCode = wbsCode + controlItemAndCycleItem.InitControlItemCode.Substring(controlItemAndCycleItem.InitControlItemCode.Length - 2, 2);
}
}
}
#region 下载WBS编码规则文件
/// <summary>
/// 下载WBS编码规则文件按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnFile_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载WBS编码规则文件吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
}
/// <summary>
/// 下载导入模板
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
{
if (e.EventArgument == "Confirm_OK")
{
string rootPath = Server.MapPath("~/");
string filePath = Const.WBSCodeTemplateUrl;
string uploadfilepath = rootPath + filePath;
string fileName = Path.GetFileName(filePath);
FileInfo info = new FileInfo(uploadfilepath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(uploadfilepath, 0, fileSize);
Response.End();
}
}
#endregion
}
}

27
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs generated
View File

@ -84,6 +84,33 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnFile 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnFile;
/// <summary>
/// btnCreateCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCreateCode;
/// <summary>
/// Label3 控件。
/// </summary>

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

@ -558,7 +558,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageContent = workPackageProject.PackageContent + name;
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
@ -661,7 +661,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageContent = workPackageProject.PackageContent + name;
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.IsApprove = true;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
@ -732,7 +732,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageContent = workPackageProject.PackageContent + name;
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));

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

@ -590,7 +590,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.SuperWorkPackageId = WorkPackageId;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
@ -690,7 +690,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.SuperWorkPackageId = WorkPackageId;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.IsApprove = true;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
@ -762,7 +762,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.SuperWorkPackageId = WorkPackageId;
newWorkPackage.IsChild = workPackageProject.IsChild;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));

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

@ -519,7 +519,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageContent = workPackageProject.PackageContent + "-" + txtName;
newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack;
newWorkPackage.SuperWorkPackageId = WorkPackageId;
newWorkPackage.PackageCode = code;
newWorkPackage.PackageCode = workPackageProject.PackageCode;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.IsApprove = true;

48
SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
View File

@ -322,47 +322,47 @@ namespace Web.Controls
chartArea.Area3DStyle.Enable3D = false;
chart1.ChartAreas.Add(chartArea);
chart1.Series.Add("本月概算工程量");
chart1.Series.Add("本月实际工程量");
chart1.Series.Add("累计概算工程量");
chart1.Series.Add("累计实际工程量");
chart1.Series.Add("本月概算费用");
chart1.Series.Add("本月实际费用");
chart1.Series.Add("累计概算费用");
chart1.Series.Add("累计实际费用");
DataView dv = dt.DefaultView;
chart1.Series["本月概算工程量"].Points.DataBindXY(dv, "月份", dv, "本月概算工程量");
chart1.Series["本月概算工程量"].ChartType = SeriesChartType.Column;
chart1.Series["本月概算费用"].Points.DataBindXY(dv, "月份", dv, "本月概算费用");
chart1.Series["本月概算费用"].ChartType = SeriesChartType.Column;
for (int i = 0; i < chart1.Series["本月概算工程量"].Points.Count; i++)
for (int i = 0; i < chart1.Series["本月概算费用"].Points.Count; i++)
{
chart1.Series["本月概算工程量"].Points[i].ToolTip = "本月概算工程量\n#VALX\n#VALY";
chart1.Series["本月概算费用"].Points[i].ToolTip = "本月概算费用\n#VALX\n#VALY";
}
chart1.Series["本月实际工程量"].Points.DataBindXY(dv, "月份", dv, "本月实际工程量");
chart1.Series["本月实际工程量"].ChartType = SeriesChartType.Column;
chart1.Series["本月实际费用"].Points.DataBindXY(dv, "月份", dv, "本月实际费用");
chart1.Series["本月实际费用"].ChartType = SeriesChartType.Column;
for (int i = 0; i < chart1.Series["本月实际工程量"].Points.Count; i++)
for (int i = 0; i < chart1.Series["本月实际费用"].Points.Count; i++)
{
chart1.Series["本月实际工程量"].Points[i].ToolTip = "本月实际工程量\n#VALX\n#VALY";
chart1.Series["本月实际费用"].Points[i].ToolTip = "本月实际费用\n#VALX\n#VALY";
}
chart1.Series["累计概算工程量"].Points.DataBindXY(dv, "月份", dv, "累计概算工程量");
chart1.Series["累计概算工程量"].ChartType = SeriesChartType.Spline;
chart1.Series["累计概算工程量"].Color = Color.MediumSeaGreen;
chart1.Series["累计概算工程量"].BorderWidth = 2;
chart1.Series["累计概算费用"].Points.DataBindXY(dv, "月份", dv, "累计概算费用");
chart1.Series["累计概算费用"].ChartType = SeriesChartType.Spline;
chart1.Series["累计概算费用"].Color = Color.MediumSeaGreen;
chart1.Series["累计概算费用"].BorderWidth = 2;
for (int i = 0; i < chart1.Series["累计概算工程量"].Points.Count; i++)
for (int i = 0; i < chart1.Series["累计概算费用"].Points.Count; i++)
{
chart1.Series["累计概算工程量"].Points[i].ToolTip = "累计概算工程量\n#VALX\n#VALY";
chart1.Series["累计概算费用"].Points[i].ToolTip = "累计概算费用\n#VALX\n#VALY";
}
chart1.Series["累计实际工程量"].Points.DataBindXY(dv, "月份", dv, "累计实际工程量");
chart1.Series["累计实际工程量"].ChartType = SeriesChartType.Spline;
chart1.Series["累计实际工程量"].Color = Color.Red;
chart1.Series["累计实际工程量"].BorderWidth = 2;
chart1.Series["累计实际费用"].Points.DataBindXY(dv, "月份", dv, "累计实际费用");
chart1.Series["累计实际费用"].ChartType = SeriesChartType.Spline;
chart1.Series["累计实际费用"].Color = Color.Red;
chart1.Series["累计实际费用"].BorderWidth = 2;
for (int i = 0; i < chart1.Series["累计实际工程量"].Points.Count; i++)
for (int i = 0; i < chart1.Series["累计实际费用"].Points.Count; i++)
{
chart1.Series["累计实际工程量"].Points[i].ToolTip = "累计实际工程量\n#VALX\n#VALY";
chart1.Series["累计实际费用"].Points[i].ToolTip = "累计实际费用\n#VALX\n#VALY";
}
Controls.Add(chart1);

48
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1,11 +1,14 @@
错误信息开始=====>
错误类型:SqlException
错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。
错误类型:ThreadAbortException
错误信息:正在中止线程。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 SNIReadSyncOverAsync(SNI_ConnWrapper* , SNI_Packet** , Int32 )
在 SNINativeMethodWrapper.SNIReadSyncOverAsync(SafeHandle pConn, IntPtr& packet, Int32 timeout)
在 System.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
在 System.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
在 System.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer()
在 System.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
@ -21,21 +24,28 @@
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
在 FineUIPro.Web.common.main.getSitePerson() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 90
在 FineUIPro.Web.common.main.Page_Load(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 20
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\GetDataService.cs:行号 148
在 BLL.MonitorService.DoSynchData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 2129
在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 110
出错时间:08/30/2023 11:27:45
出错时间:08/30/2023 11:27:45
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 581
在 FineUIPro.Web.indexProject.btnJDGL_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 711
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
----错误类型:Win32Exception
----错误信息:
----等待的操作过时。
----错误堆栈:
出错时间:08/25/2023 15:46:55
出错文件:http://localhost:8797/common/main.aspx
出错时间:08/30/2023 14:19:32
出错文件:http://localhost:8797/indexProject.aspx?projectId=d93b0835-ffbd-4039-bed3-2df806adae56
IP地址:::1
操作人员:JT
出错时间:08/25/2023 15:46:55
出错时间:08/30/2023 14:19:32

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/WBS编码规则.xlsx Normal file
View File

Binary file not shown.

26
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
View File

@ -72,21 +72,21 @@ namespace FineUIPro.Web.HJGL.DataImport
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
//var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x;
//var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
if (unitWork1.Count() > 0)

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

@ -78,21 +78,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
var TrustItemList = (from x in Funs.DB.HJGL_Hard_TrustItem
join y in Funs.DB.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID
where y.ProjectId == this.CurrUser.LoginProjectId

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

@ -111,21 +111,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
var ReportList = (from x in Funs.DB.HJGL_HotProess_Report
join y in Funs.DB.HJGL_HotProess_TrustItem on x.HotProessTrustItemId equals y.HotProessTrustItemId
join z in Funs.DB.HJGL_HotProess_Trust on y.HotProessTrustId equals z.HotProessTrustId

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

@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
var TrustItemList = (from x in Funs.DB.HJGL_HotProess_TrustItem
join y in Funs.DB.HJGL_HotProess_Trust on x.HotProessTrustId equals y.HotProessTrustId
where y.ProjectId == this.CurrUser.LoginProjectId

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

@ -113,21 +113,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
var WeldJointList = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
where x.ProjectId == this.CurrUser.LoginProjectId && x.WeldingDailyId != null && x.IsHotProess == true

26
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
View File

@ -134,21 +134,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{
foreach (var q in unitWork1)

26
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
View File

@ -81,21 +81,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -79,21 +79,21 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -136,21 +136,21 @@ namespace FineUIPro.Web.HJGL.NDT
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PointTrust
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -57,21 +57,21 @@ namespace FineUIPro.Web.HJGL.PointTrust
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

15
SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs
View File

@ -192,11 +192,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
string row2 = pds.Rows[i][2].ToString();
if (string.IsNullOrEmpty(row2))
{
result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|";
}
else
if (!string.IsNullOrEmpty(row2))
//{
// result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|";
//}
//else
{
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
if (mainItem == null)
@ -403,7 +403,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
materialCheck.ProjectId = this.CurrUser.LoginProjectId;
materialCheck.ContractNo = pds.Rows[i][0].ToString().Trim();
materialCheck.UnitId = units.First(e => e.UnitName == pds.Rows[i][1].ToString().Trim()).UnitId;
materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId;
if (mainItems.FirstOrDefault(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()) != null)
{
materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId;
}
materialCheck.MaterialName = pds.Rows[i][3].ToString().Trim();
materialCheck.SpecificationAndModel = pds.Rows[i][4].ToString().Trim();
materialCheck.MaterialCode = pds.Rows[i][5].ToString().Trim();

26
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
View File

@ -98,21 +98,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
View File

@ -65,21 +65,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs
View File

@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -180,21 +180,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs
View File

@ -55,21 +55,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -92,21 +92,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -142,21 +142,21 @@
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -100,21 +100,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
View File

@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -100,20 +100,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
View File

@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

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

@ -59,21 +59,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{
foreach (var q in unitWork1)

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

@ -101,21 +101,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{
foreach (var q in unitWork1)

26
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
View File

@ -56,21 +56,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

26
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
View File

@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.WBS_UnitWork> unitWork1 = null;
List<Model.WBS_UnitWork> unitWork2 = null;
// 当前为施工单位，只能操作本单位的数据
if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
{
unitWork1 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
select x).ToList();
unitWork2 = (from x in unitWorkList
where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
select x).ToList();
}
else
{
//// 当前为施工单位，只能操作本单位的数据
//if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
//{
// unitWork1 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
// select x).ToList();
// unitWork2 = (from x in unitWorkList
// where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
// select x).ToList();
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
}
//}
if (unitWork1.Count() > 0)
{

18
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
View File

@ -39,18 +39,18 @@
<Columns>
<%--<f:RowNumberField HeaderText="序号"/>--%>
<f:RenderField Width="100px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:BoundField Width="350px" ColumnID="Name" DataField="Name" HeaderTextAlign="Center" EnableLock="true" Locked="true"
HeaderText="工作内容" />
<f:RenderField Width="100px" ColumnID="PreWorkCode" DataField="PreWorkCode" FieldType="String" EnableLock="true" Locked="true"
HeaderText="前置工作内容编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" HeaderText="里程碑点" HeaderTextAlign="Center" ID="IsMileStone" TextAlign="Center" EnableLock="true" Locked="true">
<ItemTemplate>
<asp:CheckBox ID="cbIsMileStone" runat="server" Enabled="false"></asp:CheckBox>
</ItemTemplate>
</f:TemplateField>
<ItemTemplate>
<asp:CheckBox ID="cbIsMileStone" runat="server" Enabled="false"></asp:CheckBox>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="JDWeights" DataField="JDWeights" FieldType="Double" EnableLock="true" Locked="true"
HeaderText="权重(%)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@ -91,11 +91,11 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
var str = F(hdIdClientID).ooIl1;
if (str == undefined) {
var str = F(hdIdClientID).getValue();
if (str == undefined || str == '') {
str = rowId;
}
else {
else if(str.indexOf(rowId) == -1){
str = str + "," + rowId;
}
F(hdIdClientID).setValue(str);

44
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
View File

@ -132,7 +132,7 @@ namespace FineUIPro.Web.JDGL.Check
{
errorInfos = string.Empty;
string Id = Request.Params["Id"];
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty);
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null);
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
@ -178,9 +178,9 @@ namespace FineUIPro.Web.JDGL.Check
private void Save()
{
decimal changePlanNum = 0, changeThisNum = 0, //当月总变化完成成本、完成预算
oldPlanNum = 0, oldThisNum = 0,
PlanNum = 0, ThisNum = 0;
decimal changePlanNum = 0, changePlanValue = 0, changeThisNum = 0, //当月总变化完成成本、完成预算
oldPlanNum = 0, oldThisNum = 0, oldPlanValue = 0,
PlanNum = 0, ThisNum = 0, PlanValue = 0, PlanCost = 0, PlanProjectQuantity = 0;
Model.SGGLDB db = Funs.DB;
var oldViewInfos = from x in db.WBS_WorkPackage
where x.ProjectId == this.CurrUser.LoginProjectId
@ -201,13 +201,17 @@ namespace FineUIPro.Web.JDGL.Check
if (WorkPackage != null)
{
string WorkPackageId = WorkPackage.WorkPackageId;
PlanCost = WorkPackage.PlanCost ?? 0;
PlanProjectQuantity = WorkPackage.PlanProjectQuantity ?? 0;
BLL.WorkPackageService.UpdateWorkPackage(WorkPackage);
for (int j = 0; j < months.Count; j++)
{
oldPlanNum = 0;
oldThisNum = 0;
oldPlanValue = 0;
changePlanNum = 0;
changeThisNum = 0;
changePlanValue = 0;
string planNum = values.Value<string>(string.Format("{0:yyyy-MM}", months[j]) + "Plan");
string thisNum = values.Value<string>(string.Format("{0:yyyy-MM}", months[j]) + "This");
Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(WorkPackageId, months[j]);
@ -215,10 +219,20 @@ namespace FineUIPro.Web.JDGL.Check
{
oldPlanNum = WorkPackageDetail.PlanNum ?? 0;
oldThisNum = WorkPackageDetail.ThisNum ?? 0;
oldPlanValue = WorkPackageDetail.PlanValue ?? 0;
WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum);
WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum);
if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0)
{
WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2);
}
else
{
WorkPackageDetail.PlanValue = 0;
}
PlanNum = WorkPackageDetail.PlanNum ?? 0;
ThisNum = WorkPackageDetail.ThisNum ?? 0;
PlanValue = WorkPackageDetail.PlanValue ?? 0;
}
else
{
@ -228,21 +242,32 @@ namespace FineUIPro.Web.JDGL.Check
WorkPackageDetail.Months = months[j];
WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum);
WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum);
if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0)
{
WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2);
}
else
{
WorkPackageDetail.PlanValue = 0;
}
PlanNum = WorkPackageDetail.PlanNum ?? 0;
ThisNum = WorkPackageDetail.ThisNum ?? 0;
PlanValue = WorkPackageDetail.PlanValue ?? 0;
db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail);
}
//累加变化值，计算总的变化值
changePlanNum += PlanNum - oldPlanNum;
changeThisNum += ThisNum - oldThisNum;
changePlanValue += PlanValue - oldPlanValue;
////更新分部分项
UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum);
UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum, changePlanValue);
////更新单位工程
Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months[j]);
if (unitWorkDetail != null)
{
unitWorkDetail.PlanNum += changePlanNum;
unitWorkDetail.ThisNum += changeThisNum;
unitWorkDetail.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(unitWorkDetail);
}
else
@ -253,6 +278,7 @@ namespace FineUIPro.Web.JDGL.Check
unitWorkDetail.Months = months[j];
unitWorkDetail.PlanNum = changePlanNum;
unitWorkDetail.ThisNum = changeThisNum;
unitWorkDetail.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(unitWorkDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail);
}
@ -265,6 +291,7 @@ namespace FineUIPro.Web.JDGL.Check
{
projectType.PlanNum += changePlanNum;
projectType.ThisNum += changeThisNum;
projectType.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(cnProfessionDetail);
}
else
@ -276,6 +303,7 @@ namespace FineUIPro.Web.JDGL.Check
projectType.Months = months[j];
projectType.PlanNum = changePlanNum;
projectType.ThisNum = changeThisNum;
projectType.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(cnProfessionDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType);
}
@ -296,7 +324,7 @@ namespace FineUIPro.Web.JDGL.Check
/// <param name="months"></param>
/// <param name="PlanNum"></param>
/// <param name="parentId"></param>
private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum)
private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum, decimal changePlanValue)
{
Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
if (workPackage != null)
@ -306,6 +334,7 @@ namespace FineUIPro.Web.JDGL.Check
{
parentDetail.PlanNum += changePlanNum;
parentDetail.ThisNum += changeThisNum;
parentDetail.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(parentDetail);
}
else
@ -316,12 +345,13 @@ namespace FineUIPro.Web.JDGL.Check
parentDetail.Months = months;
parentDetail.PlanNum = changePlanNum;
parentDetail.ThisNum = changeThisNum;
parentDetail.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(parentDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
}
if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环
{
UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum);
UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum, changePlanValue);
}
}
}

16
SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx
View File

@ -42,17 +42,17 @@
<f:RenderField Width="100px" ColumnID="月份" DataField="月份"
FieldType="String" HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="本月概算工程量" DataField="本月概算工程量"
FieldType="Double" HeaderText="本月概算工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="本月概算费用" DataField="本月概算费用"
FieldType="Double" HeaderText="本月概算费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="累计概算工程量" DataField="累计概算工程量"
FieldType="Double" HeaderText="累计概算工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="累计概算费用" DataField="累计概算费用"
FieldType="Double" HeaderText="累计概算费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="本月实际工程量" DataField="本月实际工程量"
FieldType="Double" HeaderText="本月实际工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="本月实际费用" DataField="本月实际费用"
FieldType="Double" HeaderText="本月实际费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="累计实际工程量" DataField="累计实际工程量"
FieldType="Double" HeaderText="累计实际工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="累计实际费用" DataField="累计实际费用"
FieldType="Double" HeaderText="累计实际费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
</f:Grid>

44
SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs
View File

@ -214,7 +214,7 @@ namespace FineUIPro.Web.JDGL.Check
if (WorkPackage != null && BLL.WorkPackageService.GetAllWorkPackagesBySuperWorkPackageId(WorkPackage.WorkPackageId).Count == 0)
{
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," +
"PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " +
"PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " +
"from dbo.View_WBS_WorkPackageDetail as t where WorkPackageId=@Id order by t.Months";
//string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
SqlParameter[] parameter = new SqlParameter[]
@ -228,39 +228,39 @@ namespace FineUIPro.Web.JDGL.Check
decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
for (int i = 0; i < dt.Rows.Count; i++)
{
dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString());
dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString());
dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString());
dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString());
if (acwp == lastacwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计概算工程量"] = DBNull.Value;
dt.Rows[i]["累计概算费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
if (bcwp == lastbcwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计实际工程量"] = DBNull.Value;
dt.Rows[i]["累计实际费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
lastacwp = acwp;
lastbcwp = bcwp;
@ -270,7 +270,7 @@ namespace FineUIPro.Web.JDGL.Check
else
{
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," +
"PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " +
"PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " +
"from dbo.View_WBS_WorkPackageParentDetail as t where ParentId=@Id order by t.Months";
//string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
SqlParameter[] parameter = new SqlParameter[]
@ -288,39 +288,39 @@ namespace FineUIPro.Web.JDGL.Check
decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
for (int i = 0; i < dt.Rows.Count; i++)
{
dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString());
dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString());
dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString());
dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString());
if (acwp == lastacwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计概算工程量"] = DBNull.Value;
dt.Rows[i]["累计概算费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
if (bcwp == lastbcwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计实际工程量"] = DBNull.Value;
dt.Rows[i]["累计实际费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
lastacwp = acwp;
lastbcwp = bcwp;

18
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
View File

@ -14,6 +14,10 @@
white-space: normal;
word-break: break-all;
}
.f-grid-row.red {
background-color: red;
}
</style>
</head>
<body>
@ -29,6 +33,14 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
LabelAlign="right" >
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
LabelAlign="right" >
</f:DatePicker>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
OnClick="btnSave_Click">
@ -127,11 +139,11 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
var str = F(hdIdClientID).ooIl1;
if (str == undefined) {
var str = F(hdIdClientID).getValue();
if (str == undefined || str == '') {
str = rowId;
}
else {
else if(str.indexOf(rowId) == -1){
str = str + "," + rowId;
}
F(hdIdClientID).setValue(str);

18
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check
private void BindGrid()
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty);
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim());
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
@ -54,6 +54,15 @@ namespace FineUIPro.Web.JDGL.Check
cbIsMileStone.Checked = true;
}
}
if (!string.IsNullOrEmpty(this.Grid1.Rows[i].Values[10].ToString()))
{
DateTime planEndDate = Convert.ToDateTime(this.Grid1.Rows[i].Values[10].ToString());
DateTime realEndDate = Funs.GetNewDateTimeOrNow(this.Grid1.Rows[i].Values[12].ToString());
if (planEndDate < realEndDate)
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
}
@ -180,7 +189,7 @@ namespace FineUIPro.Web.JDGL.Check
{
try
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out");
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out",this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim());
string projectNmae = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
if (!string.IsNullOrEmpty(projectNmae))
{
@ -357,5 +366,10 @@ namespace FineUIPro.Web.JDGL.Check
}
}
#endregion
protected void btnQuery_Click(object sender, EventArgs e)
{
BindGrid();
}
}
}

27
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs generated
View File

@ -66,6 +66,33 @@ namespace FineUIPro.Web.JDGL.Check {
/// </remarks>
protected global::FineUIPro.TextBox hdId;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnSave 控件。
/// </summary>

368
SGGL/Model/Model.cs
View File

@ -290791,6 +290791,12 @@ namespace Model
private string _WBSType;
private System.Nullable<System.DateTime> _PlanStartDate;
private System.Nullable<System.DateTime> _PlanEndDate;
private string _WBSCode;
private string _ProjectId;
public View_WBS()
@ -290845,7 +290851,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(101)")]
public string Name
{
get
@ -290877,6 +290883,54 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStartDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanStartDate
{
get
{
return this._PlanStartDate;
}
set
{
if ((this._PlanStartDate != value))
{
this._PlanStartDate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEndDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanEndDate
{
get
{
return this._PlanEndDate;
}
set
{
if ((this._PlanEndDate != value))
{
this._PlanEndDate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")]
public string WBSCode
{
get
{
return this._WBSCode;
}
set
{
if ((this._WBSCode != value))
{
this._WBSCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
@ -291289,10 +291343,18 @@ namespace Model
private System.Nullable<double> _TotalThisNum;
private System.Nullable<double> _TotalPlanValue;
private System.Nullable<double> _TotalThisValue;
private System.Nullable<double> _PlanNum;
private System.Nullable<double> _ThisNum;
private System.Nullable<double> _PlanValue;
private System.Nullable<double> _ThisValue;
public View_WBS_WorkPackageDetail()
{
}
@ -291473,6 +291535,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanValue", DbType="Float")]
public System.Nullable<double> TotalPlanValue
{
get
{
return this._TotalPlanValue;
}
set
{
if ((this._TotalPlanValue != value))
{
this._TotalPlanValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalThisValue", DbType="Float")]
public System.Nullable<double> TotalThisValue
{
get
{
return this._TotalThisValue;
}
set
{
if ((this._TotalThisValue != value))
{
this._TotalThisValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanNum", DbType="Float")]
public System.Nullable<double> PlanNum
{
@ -291504,6 +291598,38 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Float")]
public System.Nullable<double> PlanValue
{
get
{
return this._PlanValue;
}
set
{
if ((this._PlanValue != value))
{
this._PlanValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Float")]
public System.Nullable<double> ThisValue
{
get
{
return this._ThisValue;
}
set
{
if ((this._ThisValue != value))
{
this._ThisValue = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBS_WorkPackageParentDetail")]
@ -291522,10 +291648,18 @@ namespace Model
private System.Nullable<double> _ThisNum;
private System.Nullable<double> _PlanValue;
private System.Nullable<double> _ThisValue;
private System.Nullable<double> _TotalPlanNum;
private System.Nullable<double> _TotalThisNum;
private System.Nullable<double> _TotalPlanValue;
private System.Nullable<double> _TotalThisValue;
public View_WBS_WorkPackageParentDetail()
{
}
@ -291626,6 +291760,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Float")]
public System.Nullable<double> PlanValue
{
get
{
return this._PlanValue;
}
set
{
if ((this._PlanValue != value))
{
this._PlanValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Float")]
public System.Nullable<double> ThisValue
{
get
{
return this._ThisValue;
}
set
{
if ((this._ThisValue != value))
{
this._ThisValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanNum", DbType="Float")]
public System.Nullable<double> TotalPlanNum
{
@ -291657,6 +291823,38 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanValue", DbType="Float")]
public System.Nullable<double> TotalPlanValue
{
get
{
return this._TotalPlanValue;
}
set
{
if ((this._TotalPlanValue != value))
{
this._TotalPlanValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalThisValue", DbType="Float")]
public System.Nullable<double> TotalThisValue
{
get
{
return this._TotalThisValue;
}
set
{
if ((this._TotalThisValue != value))
{
this._TotalThisValue = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Welder_WelderQualify")]
@ -293291,6 +293489,8 @@ namespace Model
private System.Nullable<System.DateTime> _RealEndDate;
private string _WBSCode;
private EntityRef<WBS_WorkPackage> _WBS_WorkPackage;
#region 可扩展性方法定义
@ -293339,6 +293539,8 @@ namespace Model
partial void OnCheckAcceptTypeChanged();
partial void OnRealEndDateChanging(System.Nullable<System.DateTime> value);
partial void OnRealEndDateChanged();
partial void OnWBSCodeChanging(string value);
partial void OnWBSCodeChanged();
#endregion
public WBS_ControlItemAndCycle()
@ -293771,6 +293973,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")]
public string WBSCode
{
get
{
return this._WBSCode;
}
set
{
if ((this._WBSCode != value))
{
this.OnWBSCodeChanging(value);
this.SendPropertyChanging();
this._WBSCode = value;
this.SendPropertyChanged("WBSCode");
this.OnWBSCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)]
public WBS_WorkPackage WBS_WorkPackage
{
@ -294934,6 +295156,8 @@ namespace Model
private System.Nullable<decimal> _JDWeights;
private string _WBSCode;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
private EntitySet<Accident_AccidentReport> _Accident_AccidentReport;
@ -295024,6 +295248,8 @@ namespace Model
partial void OnPlanCostChanged();
partial void OnJDWeightsChanging(System.Nullable<decimal> value);
partial void OnJDWeightsChanged();
partial void OnWBSCodeChanging(string value);
partial void OnWBSCodeChanged();
#endregion
public WBS_UnitWork()
@ -295447,6 +295673,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")]
public string WBSCode
{
get
{
return this._WBSCode;
}
set
{
if ((this._WBSCode != value))
{
this.OnWBSCodeChanging(value);
this.SendPropertyChanging();
this._WBSCode = value;
this.SendPropertyChanged("WBSCode");
this.OnWBSCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_ProjectData_WorkArea", Storage="_Accident_AccidentPersonRecord", ThisKey="UnitWorkId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentPersonRecord> Accident_AccidentPersonRecord
{
@ -296161,6 +296407,8 @@ namespace Model
private string _PreWorkCode;
private string _WBSCode;
private EntitySet<WBS_ControlItemAndCycle> _WBS_ControlItemAndCycle;
private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@ -296231,6 +296479,8 @@ namespace Model
partial void OnJDWeightsChanged();
partial void OnPreWorkCodeChanging(string value);
partial void OnPreWorkCodeChanged();
partial void OnWBSCodeChanging(string value);
partial void OnWBSCodeChanged();
#endregion
public WBS_WorkPackage()
@ -296845,6 +297095,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")]
public string WBSCode
{
get
{
return this._WBSCode;
}
set
{
if ((this._WBSCode != value))
{
this.OnWBSCodeChanging(value);
this.SendPropertyChanging();
this._WBSCode = value;
this.SendPropertyChanged("WBSCode");
this.OnWBSCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")]
public EntitySet<WBS_ControlItemAndCycle> WBS_ControlItemAndCycle
{
@ -296966,6 +297236,10 @@ namespace Model
private System.Nullable<decimal> _ThisNum;
private System.Nullable<decimal> _PlanValue;
private System.Nullable<decimal> _ThisValue;
private EntityRef<WBS_WorkPackage> _WBS_WorkPackage;
#region 可扩展性方法定义
@ -296982,6 +297256,10 @@ namespace Model
partial void OnPlanNumChanged();
partial void OnThisNumChanging(System.Nullable<decimal> value);
partial void OnThisNumChanged();
partial void OnPlanValueChanging(System.Nullable<decimal> value);
partial void OnPlanValueChanged();
partial void OnThisValueChanging(System.Nullable<decimal> value);
partial void OnThisValueChanged();
#endregion
public WBS_WorkPackageDetail()
@ -297094,6 +297372,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Decimal(18,2)")]
public System.Nullable<decimal> PlanValue
{
get
{
return this._PlanValue;
}
set
{
if ((this._PlanValue != value))
{
this.OnPlanValueChanging(value);
this.SendPropertyChanging();
this._PlanValue = value;
this.SendPropertyChanged("PlanValue");
this.OnPlanValueChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ThisValue
{
get
{
return this._ThisValue;
}
set
{
if ((this._ThisValue != value))
{
this.OnThisValueChanging(value);
this.SendPropertyChanging();
this._ThisValue = value;
this.SendPropertyChanged("ThisValue");
this.OnThisValueChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_WorkPackageDetail_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)]
public WBS_WorkPackage WBS_WorkPackage
{
@ -297401,6 +297719,10 @@ namespace Model
private System.Nullable<decimal> _ThisNum;
private System.Nullable<decimal> _PlanValue;
private System.Nullable<decimal> _ThisValue;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -297417,6 +297739,10 @@ namespace Model
partial void OnPlanNumChanged();
partial void OnThisNumChanging(System.Nullable<decimal> value);
partial void OnThisNumChanged();
partial void OnPlanValueChanging(System.Nullable<decimal> value);
partial void OnPlanValueChanged();
partial void OnThisValueChanging(System.Nullable<decimal> value);
partial void OnThisValueChanged();
#endregion
public WBS_WorkPackageParentDetail()
@ -297544,6 +297870,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Decimal(18,2)")]
public System.Nullable<decimal> PlanValue
{
get
{
return this._PlanValue;
}
set
{
if ((this._PlanValue != value))
{
this.OnPlanValueChanging(value);
this.SendPropertyChanging();
this._PlanValue = value;
this.SendPropertyChanged("PlanValue");
this.OnPlanValueChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ThisValue
{
get
{
return this._ThisValue;
}
set
{
if ((this._ThisValue != value))
{
this.OnThisValueChanging(value);
this.SendPropertyChanging();
this._ThisValue = value;
this.SendPropertyChanged("ThisValue");
this.OnThisValueChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;