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/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;
}
}