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

提交代码

This commit is contained in:
高飞 2023-11-27 12:13:21 +08:00
parent 971aae10d6
commit 86d48d63f2
4 changed files with 267 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
DataBase/版本日志/SGGLDB_V2023-11-27.sql Normal file
View File

@ -0,0 +1,61 @@
ALTER VIEW [dbo].[View_HJGL_Batch_PointBatchItem]
AS
/*************点口明细表*************/
SELECT PointBatchItem.PointBatchItemId,
PointBatchItem.PointBatchId,
PointBatch.ProjectId,
PointBatch.UnitId,
PointBatch.DetectionTypeId,
PointBatch.DetectionRateId,
PointBatch.PointBatchCode,
Pipeline.UnitWorkId,
PointBatchItem.WeldJointId,
(CASE PointBatchItem.PointState WHEN '1' THEN '点口' WHEN '2' THEN '扩透' END) AS PointState,
(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '是' ELSE '' END) AS IsBuildTrust,
(CASE WHEN PointBatchItem.IsAudit=1 THEN '是'
WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '否'
WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit,
PointBatchItem.PointDate,--点口日期
(CASE PointBatchItem.IsWelderFirst WHEN 1 THEN '是' ELSE '' END) AS IsWelderFirst,
PointBatchItem.RepairDate,--返修日期
PointBatchItem.RepairRecordId,
PointBatchItem.CutDate,--切除日期
PointBatchItem.PBackingWelderId,--返修打底焊工
PointBatchItem.PCoverWelderId,--返修盖面焊工
UnitWork.UnitWorkCode,--工区号
WeldJoint.WeldJointCode,--焊口号
WeldJoint.BackingWelderId AS WelderId, --焊工ID
BackingWelder.WelderCode AS BackingWelderCode,
CoverWelder.WelderCode AS CoverWelderCode,
WeldType.WeldTypeCode,
WeldJoint.JointAttribute,
WeldJoint.JointArea,--焊接区域
WeldJoint.Size,--实际寸径
WeldingDaily.WeldingDate,--焊接日期
WeldJoint.PipelineId, --管线ID
WeldJoint.Material1Id AS Mat, --材质
WeldJoint.Specification, --规格
Pipeline.PipelineCode, --管线号
PipingClass.PipingClassName , --管道等级
WeldJoint.BackingWelderId,
WeldJoint.CoverWelderId
FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem
LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId
LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId
LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId
LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId
LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId
LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId
LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId
LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId
LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId
where (WeldJoint.IsHotProess!=1 or WeldJoint.IsHotProess is null or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1))
and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId
GO

115
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
View File

@ -41,8 +41,8 @@
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="imgBtnFile" Text="现场照片" ToolTip="上传及查看" Icon="TableCell" runat="server"
OnClick="imgBtnFile_Click">
</f:Button>
OnClick="imgBtnFile_Click">
</f:Button>
<f:HiddenField runat="server" ID="hdWorkPostId"></f:HiddenField>
<f:HiddenField runat="server" ID="hdMachineId"></f:HiddenField>
<f:HiddenField runat="server" ID="hdConstructionLogId"></f:HiddenField>
@ -87,9 +87,9 @@
</f:FormRow>
<f:FormRow ColumnWidths="13% 20% 67%">
<Items>
<f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
<f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="btnWorkEfficiency" Text="未填报" ToolTip="填报工效数据" Icon="TableCell" OnClick="btnWorkEfficiency_Click" runat="server">
</f:Button>
</f:Button>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
</Items>
</f:FormRow>
@ -104,7 +104,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="作业人员人数" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogPersonId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogPersonId"
SortField="ConstructionLogPersonId" EnableTextSelection="True">
SortField="ConstructionLogPersonId" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField HeaderText="单位工程" ColumnID="UnitWorkName" HeaderTextAlign="Center" Width="200px">
@ -116,6 +116,9 @@
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:FormRow>
@ -124,7 +127,7 @@
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="机械数量" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogMachineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogMachineId"
SortField="ConstructionLogMachineId" EnableTextSelection="True">
SortField="ConstructionLogMachineId" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField HeaderText="单位工程" ColumnID="UnitWorkName" HeaderTextAlign="Center" Width="200px">
@ -136,6 +139,9 @@
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:FormRow>
@ -427,6 +433,103 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum1') {
var TotalNum = me.getCellValue(rowId, 'TotalNum');
var TotalCompleteNum1 = me.getCellValue(rowId, 'TotalCompleteNum1');
if (TotalNum.toString() != "" && TotalCompleteNum1.toString() != "") {
if (TotalNum !== "0") {
me.updateCellValue(rowId, 'TotalRate1', (TotalCompleteNum1 / TotalNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalRate1', (""));
}
}
}
if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum2') {
var TotalNum = me.getCellValue(rowId, 'TotalNum');
var TotalCompleteNum2 = me.getCellValue(rowId, 'TotalCompleteNum2');
if (TotalNum.toString() != "" && TotalCompleteNum2.toString() != "") {
if (TotalNum !== "0") {
me.updateCellValue(rowId, 'TotalRate2', (TotalCompleteNum2 / TotalNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalRate2', (""));
}
}
}
if (columnId === 'FilmNum' || columnId === 'NotOKFileNum') {
var FilmNum = me.getCellValue(rowId, 'FilmNum');
var NotOKFileNum = me.getCellValue(rowId, 'NotOKFileNum');
if (FilmNum.toString() != "" && NotOKFileNum.toString() != "") {
if (FilmNum !== "0") {
me.updateCellValue(rowId, 'OneOKRate', ((FilmNum - NotOKFileNum) / FilmNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'OneOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalFilmNum' || columnId === 'TotalNotOKFileNum') {
var TotalFilmNum = me.getCellValue(rowId, 'TotalFilmNum');
var TotalNotOKFileNum = me.getCellValue(rowId, 'TotalNotOKFileNum');
if (TotalFilmNum.toString() != "" && TotalNotOKFileNum.toString() != "") {
if (TotalFilmNum !== "0") {
me.updateCellValue(rowId, 'TotalOneOKRate', ((TotalFilmNum - TotalNotOKFileNum) / TotalFilmNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalOneOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'ThisPersonNum' || columnId === 'ThisOKPersonNum') {
var ThisPersonNum = me.getCellValue(rowId, 'ThisPersonNum');
var ThisOKPersonNum = me.getCellValue(rowId, 'ThisOKPersonNum');
if (ThisPersonNum.toString() != "" && ThisOKPersonNum.toString() != "") {
if (ThisPersonNum !== "0") {
me.updateCellValue(rowId, 'ThisOKRate', (ThisOKPersonNum / ThisPersonNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'ThisOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalPersonNum' || columnId === 'TotalOKPersonNum') {
var TotalPersonNum = me.getCellValue(rowId, 'TotalPersonNum');
var TotalOKPersonNum = me.getCellValue(rowId, 'TotalOKPersonNum');
if (TotalPersonNum.toString() != "" && TotalOKPersonNum.toString() != "") {
if (TotalPersonNum !== "0") {
me.updateCellValue(rowId, 'TotalOKRate', (TotalOKPersonNum / TotalPersonNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalSpotNum' || columnId === 'TotalSpotOKNum') {
var TotalSpotNum = me.getCellValue(rowId, 'TotalSpotNum');
var TotalSpotOKNum = me.getCellValue(rowId, 'TotalSpotOKNum');
if (TotalSpotNum.toString() != "" && TotalSpotOKNum.toString() != "") {
if (TotalSpotNum !== "0") {
me.updateCellValue(rowId, 'TotalSpotOKRate', ((TotalSpotOKNum) / TotalSpotNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalSpotOKRate', (""));
}
}
}
}
function updateSummary() {
// 回发到后台更新
__doPostBack('', 'UPDATE_SUMMARY');
}
</script>
</body>
</html>

96
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
View File

@ -131,9 +131,105 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.txtReportDate.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.InitTreeMenu();
}
else
{
if (GetRequestEventArgument() == "UPDATE_SUMMARY")
{
// 页面要求重新计算合计行的值
OutputSummaryData();
}
}
}
#endregion
private void OutputSummaryData()
{
//JObject summary = new JObject();
//int filmNum = 0, notOKFileNum = 0, repairFileNum = 0, totalFilmNum = 0, totalNotOKFileNum = 0;
//string oneOKRate = string.Empty, totalOneOKRate = string.Empty;
//foreach (JObject mergedRow in GridNDTCheck.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// if (values["FilmNum"].ToString() != "" && values["NotOKFileNum"].ToString() != "")
// {
// filmNum += values.Value<int>("FilmNum");
// notOKFileNum += values.Value<int>("NotOKFileNum");
// }
// if (values["RepairFileNum"].ToString() != "")
// {
// repairFileNum += values.Value<int>("RepairFileNum");
// }
// if (values["TotalFilmNum"].ToString() != "" && values["TotalNotOKFileNum"].ToString() != "")
// {
// totalFilmNum += values.Value<int>("TotalFilmNum");
// totalNotOKFileNum += values.Value<int>("TotalNotOKFileNum");
// }
//}
//if (filmNum > 0)
//{
// var a = Convert.ToDouble(filmNum - notOKFileNum);
// var b = Convert.ToDouble(filmNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// oneOKRate = result.ToString() + "%";
//}
//if (totalFilmNum > 0)
//{
// var a = Convert.ToDouble(totalFilmNum - totalNotOKFileNum);
// var b = Convert.ToDouble(totalFilmNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// totalOneOKRate = result.ToString() + "%";
//}
//JObject summary1 = new JObject();
//summary1.Add("UnitName", "合计");
//summary1.Add("FilmNum", filmNum);
//summary1.Add("NotOKFileNum", notOKFileNum);
//summary1.Add("RepairFileNum", repairFileNum);
//summary1.Add("OneOKRate", oneOKRate);
//summary1.Add("TotalFilmNum", totalFilmNum);
//summary1.Add("TotalNotOKFileNum", totalNotOKFileNum);
//summary1.Add("TotalOneOKRate", totalOneOKRate);
//GridNDTCheck.SummaryData = summary1;
//int thisPersonNum = 0, thisOKPersonNum = 0, totalPersonNum = 0, totalOKPersonNum = 0;
//string thisOKRate = string.Empty, totalOKRate = string.Empty;
//foreach (JObject mergedRow in GridWelder.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// if (values["ThisPersonNum"].ToString() != "" && values["ThisOKPersonNum"].ToString() != "")
// {
// thisPersonNum += values.Value<int>("ThisPersonNum");
// thisOKPersonNum += values.Value<int>("ThisOKPersonNum");
// }
// if (values["TotalPersonNum"].ToString() != "" && values["TotalOKPersonNum"].ToString() != "")
// {
// totalPersonNum += values.Value<int>("TotalPersonNum");
// totalOKPersonNum += values.Value<int>("TotalOKPersonNum");
// }
//}
//if (thisPersonNum > 0 && thisOKPersonNum > 0)
//{
// var a = Convert.ToDouble(thisOKPersonNum);
// var b = Convert.ToDouble(thisPersonNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// thisOKRate = result.ToString() + "%";
//}
//if (totalPersonNum > 0 && totalOKPersonNum > 0)
//{
// var a = Convert.ToDouble(totalOKPersonNum);
// var b = Convert.ToDouble(totalPersonNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// totalOKRate = result.ToString() + "%";
//}
//summary.Add("UnitName", "合计");
//summary.Add("ThisPersonNum", thisPersonNum);
//summary.Add("ThisOKPersonNum", thisOKPersonNum);
//summary.Add("ThisOKRate", thisOKRate);
//summary.Add("TotalPersonNum", totalPersonNum);
//summary.Add("TotalOKPersonNum", totalOKPersonNum);
//summary.Add("TotalOKRate", totalOKRate);
//GridWelder.SummaryData = summary;
}
#region 加载树装置-单位-工作区
/// <summary>
/// 加载树

2
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
View File

@ -90,7 +90,7 @@
<f:FormRow>
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
Layout="Fit" ShowHeader="true" RegionSplitWidth="20px" BodyPadding="1px" Height="110px" Title="单位工程进度统计"
Layout="Fit" ShowHeader="true" RegionSplitWidth="20px" BodyPadding="1px" Height="160px" Title="单位工程进度统计"
TitleToolTip="单位工程进度统计" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="单位工程进度统计"