diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
index fda1fea3..c792a835 100644
--- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
+++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
@@ -204,21 +204,8 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',1)
GO
-
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
- VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS',N'PHTGL/ContractCompile/ContractWBS.aspx',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
- GO
- INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
- VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'',2)
- INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
- VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ',3)
- INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
- VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'',4)
- INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
- VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'',1)
- GO
- INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
- VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'öԱͳ',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
+ VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'öԱͳ',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',2)
@@ -229,6 +216,20 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',1)
GO
+
+ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+ VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS',N'PHTGL/ContractCompile/ContractWBS.aspx',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
+ GO
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'',2)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ',3)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'',4)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'',1)
+ GO
+
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ȼ',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',40,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index 85b8475c..f377bf23 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
@@ -61,7 +61,9 @@ namespace BLL
(string.IsNullOrEmpty(table.SettledQuantity) ||
x.SettledQuantity.Contains(table.SettledQuantity)) &&
(string.IsNullOrEmpty(table.ContractId) ||
- x.ContractId.Contains(table.ContractId))
+ table.ContractId.Split(',').Contains(x.ContractId))&&
+ (string.IsNullOrEmpty(table.ProjectId) ||
+ x.ProjectId.Contains(table.ProjectId))
select x
;
@@ -269,6 +271,39 @@ namespace BLL
return SumSettledAmount;
}
+ ///
+ /// 根据主键获取工程量偏差
+ ///
+ ///
+ public static decimal GetQuantityOffset(object id)
+ {
+ decimal result = 0;
+ var model = GetPHTGL_ContractTrackById(id.ToString());
+ if (model != null)
+ {
+ result = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
+ Funs.GetNewDecimalOrZero(model.SettledQuantity);
+ }
+
+ return result;
+
+ }
+ ///
+ /// 根据主键获取费用偏差
+ ///
+ ///
+ ///
+ public static decimal GetAmountOffset(object id)
+ {
+ decimal result = 0;
+ var model = GetPHTGL_ContractTrackById(id.ToString());
+ if (model != null)
+ {
+ result =(model.EstimatedAmount??0 )- ( model.SettledAmount??0);
+ }
+
+ return result;
+ }
public static ResponeData ImportData(string path, string contractid, string projectid)
{
var responeData = new ResponeData();
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
index 4cbc8a94..c84d0cee 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
@@ -189,7 +189,7 @@ namespace BLL
}
else
{
- item.ACWP_Percentage = Math.Round(((item.ACWP_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2);
+ item.ACWP_Percentage = Math.Round(((item.ACWP_OutputValue ?? 0) / settledAmount) * contractWeight * 100, 2);
}
item.BCWS_OutputValue = (item.BCWS_Quantity ?? 0) * totalCostFixedComprehensiveUnitPrice;
@@ -199,7 +199,7 @@ namespace BLL
}
else
{
- item.BCWS_Percentage = Math.Round(((item.BCWS_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2) ;
+ item.BCWS_Percentage = Math.Round(((item.BCWS_OutputValue ?? 0) / settledAmount) * contractWeight * 100, 2) ;
}
UpdatePHTGL_ContractTrackProgress(item);
}
diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index 79fac28f..c034f5f8 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -545,7 +545,27 @@ namespace BLL
}
return unitWorkName;
}
-
+ public static string GetUnitWorkName(object unitWorkIds)
+ {
+ string unitWorkName = string.Empty;
+ if (unitWorkIds!=null&&!string.IsNullOrEmpty(unitWorkIds.ToString()))
+ {
+ string[] strs = unitWorkIds.ToString().Split(',');
+ foreach (var item in strs)
+ {
+ var un = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item);
+ if (un != null)
+ {
+ unitWorkName += un.UnitWorkName + GetProjectType(un.ProjectType) + ",";
+ }
+ }
+ if (!string.IsNullOrEmpty(unitWorkName))
+ {
+ unitWorkName = unitWorkName.Substring(0, unitWorkName.LastIndexOf(","));
+ }
+ }
+ return unitWorkName;
+ }
public static string getWorkAreaIdByWorkAreaName(string projectId, string workAreaName)
{
string id = string.Empty;
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 8d53c09b..8d7a7b0d 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -771,7 +771,7 @@ namespace BLL
public static List getUnitByUnitIds(string unitids)
{
- return Funs.DB.Base_Unit.Where(e => unitids.Contains(e.UnitId)).ToList();
+ return Funs.DB.Base_Unit.Where(e => unitids.Split(',').Contains(e.UnitId)).ToList();
}
}
}
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index 22c2cb32..100cc8d0 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -51,8 +51,8 @@
-
-
+
x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
}
+
+ if (drpUnit.SelectedValue != Const._Null)
+ {
+ task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
+ }
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
@@ -238,6 +243,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
}
+ if (drpUnit.SelectedValue != Const._Null)
+ {
+ task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
+ }
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index c947573b..2cbf7baf 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -890,6 +890,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Alert.ShowInTop("请选择任务单", MessageBoxIcon.Warning);
}
}
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ string str1 = hdItemsString.Text;
+ string str2 = hdTaskWeldJoint.Text;
+ this.InitTreeMenu();
+ var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
+ List GetWeldingTaskList = null;
+ if (unit == null)
+ {
+ GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
+ }
+ else
+ {
+ GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
+
+ }
+ this.BindGrid(GetWeldingTaskList);
+
+ }
#region 删除
protected void btnMenuDelete_Click(object sender, EventArgs e)
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
index cca2e7f2..cac234bf 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
@@ -5,11 +5,11 @@
施工基础信息录入
-
@@ -29,14 +29,14 @@
-
-
+ EmptyText="输入查询条件" Width="180px" LabelWidth="65px">
+
+
-
-
+
+
-
-
-
+
+
+
-
+
+ Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
+
+
+
-
@@ -91,7 +95,7 @@
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
- EnableTextSelection="True" EnableRowDoubleClickEvent="true"
+ EnableTextSelection="True" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
-
+