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

提交代码

Browse Source
This commit is contained in:
高飞
2023-12-01 12:56:11 +08:00
parent 5b077bfa6f
commit 32c14198db
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace BLL
set;
}
/// <summary>
/// 现场安装库存
/// 现场施工库存
/// </summary>
public static List<Model.MaterialStockItem> materialStockItems_FIELD
{
SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
+2 -2
View File
@@ -83,7 +83,7 @@ namespace BLL
return result;
}
/// <summary>
/// 现场安装完成数
/// 现场施工完成数
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
@@ -109,7 +109,7 @@ namespace BLL
return result;
}
/// <summary>
/// 现场安装未完成数
/// 现场施工未完成数
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace BLL
/// </summary>
public const string PipeArea_SHOP = "1";
/// <summary>
/// 现场安装
/// 现场施工
/// </summary>
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)
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
+1 -1
View File
@@ -65,7 +65,7 @@
<f:Button ID="btnSetShop" ToolTip="工厂预制" Text="工厂预制" Icon="ApplicationEdit"
EnablePostBack="true" OnClick="btnSetShop_Click" runat="server">
</f:Button>
<f:Button ID="btnSetFIELD" ToolTip="现场安装" Text="现场安装" Icon="ApplicationEdit"
<f:Button ID="btnSetFIELD" ToolTip="现场施工" Text="现场施工" Icon="ApplicationEdit"
EnablePostBack="true" OnClick="btnSetFIELD_Click" runat="server">
</f:Button>
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+2 -2
View File
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
TreeNode rootNode2 = new TreeNode();
rootNode2.NodeID = BLL.PipelineService.PipeArea_FIELD;
rootNode2.Text = "现场安装";
rootNode2.Text = "现场施工";
rootNode2.CommandName = 1 + "|" + Funs.GetEndPageNumber(b, pageSize);
rootNode2.EnableClickEvent = true;
rootNode2.EnableExpandEvent = true;
@@ -264,7 +264,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
AddTreeNode(BLL.PipelineService.PipeArea_SHOP, e.Node);
}
else if (e.Node.Text == "现场安装")
else if (e.Node.Text == "现场施工")
{
AddTreeNode(BLL.PipelineService.PipeArea_FIELD, e.Node);
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+1 -1
View File
@@ -28,7 +28,7 @@
</TreeNode>
<TreeNode id="4D36E99E-B3D8-4C61-826A-CBD98EC51515" Text="焊接过程管理" NavigateUrl=""><TreeNode id="E6F6982A-48C7-455C-8EBB-CC7088EBF15A" Text="焊接施工计划" NavigateUrl="HJGL/WeldingManage/WeldingPlan.aspx"></TreeNode>
<TreeNode id="ADC7EA61-6313-4DF9-913F-E9207F6525CA" Text="材料匹配(工厂预制)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=1"></TreeNode>
<TreeNode id="164E056C-30C9-4C29-A6B6-AF0F0C943A59" Text="材料匹配(现场安装)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=2"></TreeNode>
<TreeNode id="164E056C-30C9-4C29-A6B6-AF0F0C943A59" Text="材料匹配(现场施工)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=2"></TreeNode>
<TreeNode id="C1EACB23-A029-4DE7-886D-7772D9DDE735" Text="焊口二次设计" NavigateUrl="HJGL/WeldingManage/JotTwoDesign.aspx"></TreeNode>
<TreeNode id="6ce0b6bc-aa4d-4f0d-9f1f-75a553810793" Text="焊接任务单" NavigateUrl="HJGL/WeldingManage/WeldTask.aspx"></TreeNode>
<TreeNode id="5TYHMD2F-2582-4DEB-905E-6E9DCFEFBGHO" Text="焊接日报" NavigateUrl="HJGL/WeldingManage/WeldReport.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace FineUIPro.Web
}
}
#endregion
#region 现场安装进度
#region 现场施工进度
public decimal XCRate1
{
get
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</f:FormRow>
<f:FormRow ColumnWidths="18% 24% 14% 18% 18% 8%">
<Items>
<f:Label runat="server" ID="lbNotCompleteDin2" Label="现场安装未完成达因" LabelWidth="150px"></f:Label>
<f:Label runat="server" ID="lbNotCompleteDin2" Label="现场施工未完成达因" LabelWidth="150px"></f:Label>
<f:DatePicker ID="txtPlanEndDate2" Label="计划完成日期" runat="server"
DateFormatString="yyyy-MM-dd" LabelWidth="120px" LabelAlign="Right">
</f:DatePicker>
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+2 -2
View File
@@ -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;
}
}