diff --git a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
index 2c0ee10e..c7ff9f15 100644
--- a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+++ b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
@@ -18,7 +18,7 @@ namespace BLL
set;
}
///
- /// 现场安装库存
+ /// 现场施工库存
///
public static List materialStockItems_FIELD
{
diff --git a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
index 755c8bab..a19c700b 100644
--- a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
@@ -83,7 +83,7 @@ namespace BLL
return result;
}
///
- /// 现场安装完成数
+ /// 现场施工完成数
///
///
///
@@ -109,7 +109,7 @@ namespace BLL
return result;
}
///
- /// 现场安装未完成数
+ /// 现场施工未完成数
///
///
///
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
index 761cef9c..63bc03e3 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
@@ -22,7 +22,7 @@ namespace BLL
///
public const string PipeArea_SHOP = "1";
///
- /// 现场安装
+ /// 现场施工
///
public const string PipeArea_FIELD = "2";
@@ -64,7 +64,7 @@ namespace BLL
{
ListItem[] list = new ListItem[2];
list[0] = new ListItem("工厂预制", PipeArea_SHOP);
- list[1] = new ListItem("现场安装", PipeArea_FIELD);
+ list[1] = new ListItem("现场施工", PipeArea_FIELD);
return list;
}
public static void RestPipelineAndJoints(string projectid)
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
index 5292f6b1..a6a0fbe4 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
@@ -65,7 +65,7 @@
-
-
+
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
index 057a8fe1..9fa6d685 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
@@ -79,7 +79,7 @@ namespace FineUIPro.Web
}
}
#endregion
- #region 现场安装进度
+ #region 现场施工进度
public decimal XCRate1
{
get
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
index 1acaceae..5c06271e 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
@@ -168,7 +168,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
index 1deba64d..37337ce0 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
@@ -167,7 +167,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='预制口' AND jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingDate) AS DECIMAL(12,3)) AS FinishSize
from WBS_UnitWork b) v where UnitWorkId=@UnitWorkId
union
-select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
+select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(FinishSize,0)/(1.0 * TotalDin) END) AS DECIMAL(8,2))))+'%'
AS Rate from
(select b.UnitWorkId,CAST((SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='2')+(SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='安装口') AS DECIMAL(12,3)) AS TotalDin,
@@ -296,7 +296,7 @@ select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
}
else
{
- ShowNotify("现场安装未完成达因为0!", MessageBoxIcon.Warning);
+ ShowNotify("现场施工未完成达因为0!", MessageBoxIcon.Warning);
return;
}
}