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

20230901事故记录加wbs挂载字段

This commit is contained in:
杨红卫 2023-09-01 11:07:05 +08:00
parent ba6774dbae
commit 0f0da8e8bf
7 changed files with 51 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataBase/版本日志/SGGLDB_V2023-09-01.sql
View File

@ -46,3 +46,7 @@ GO
ALTER TABLE Check_SpotCheckDetail ADD WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageName NVARCHAR(2000) NULL
GO

14
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx
View File

@ -38,7 +38,7 @@
<f:CheckItem Value="LW" Text="劳务数据" />
</f:CheckBoxList>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
</f:Button>
</Items>
</f:Toolbar>
@ -46,9 +46,9 @@
<Items>
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<Items>
<f:RadioButtonList runat="server" ID="cblControlItem"
<f:RadioButtonList runat="server" ID="cblControlItem"
AutoPostBack="true" OnSelectedIndexChanged="cblControlItem_SelectedIndexChanged"
AutoColumnWidth="true" ColumnNumber="5">
AutoColumnWidth="true" ColumnNumber="5">
</f:RadioButtonList>
</Items>
</f:GroupPanel>
@ -70,9 +70,9 @@
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="160px">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
@ -107,7 +107,7 @@
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
@ -123,6 +123,6 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</script>
</body>
</html>

3
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs
View File

@ -1,10 +1,7 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using Model;
using System;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.DigData
{

47
SGGL/FineUIPro.Web/DigData/WBSDW.aspx
View File

@ -25,33 +25,34 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="WBS数据仓库"
TitleToolTip="WBS数据仓库" AutoScroll="true">
TitleToolTip="WBS数据仓库" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:CheckBoxList runat="server" ID="ckType" AutoColumnWidth="true"
<f:CheckBoxList runat="server" ID="ckType" AutoColumnWidth="true"
AutoPostBack="true" OnSelectedIndexChanged="ckType_SelectedIndexChanged">
<f:CheckItem Value="HSSE" Text="安全数据" />
<f:CheckItem Value="CQMS" Text="质量数据" />
<f:CheckItem Value="JDGL" Text="进度数据" />
<f:CheckItem Value="HTGL" Text="合同数据" />
<f:CheckItem Value="LW" Text="劳务数据" />
<f:CheckItem Value="LW" Text="劳务数据" />
</f:CheckBoxList>
<f:TextBox runat="server" ID="hdWorkPackageCode" Hidden="true"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<f:GroupPanel runat="server" ID="Panel_CurrentApproval" Title="工作包" Layout="VBox" Height="200px" AutoScroll="true">
<Items>
<f:CheckBoxList runat="server" ID="cblControlItem" Readonly="true"
AutoColumnWidth="true" ColumnNumber="5" >
</f:CheckBoxList>
<f:RadioButtonList runat="server" ID="cblControlItem"
AutoPostBack="true" OnSelectedIndexChanged="cblControlItem_SelectedIndexChanged"
AutoColumnWidth="true" ColumnNumber="5">
</f:RadioButtonList>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<Rows>
@ -65,10 +66,10 @@
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<Rows>
<f:FormRow>
@ -85,19 +86,19 @@
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<Items>
</Items>
</f:GroupPanel>
</Items>

24
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using System;
using System.Data;
using System.Linq;
@ -21,15 +22,7 @@ namespace FineUIPro.Web.DigData
protected void changeTree(object sender, EventArgs e)
{
this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
//新增UnitId
//this.UnitId = this.ucTree.UnitId;
////判断 当有WorkPackageCode的时候单位id为空
//if (!string.IsNullOrEmpty(this.WorkPackageCode))
//{
// this.UnitId = "";
//}
// this.BindGrid();
this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
initControlItem();
}
@ -59,12 +52,23 @@ namespace FineUIPro.Web.DigData
SetData();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void cblControlItem_SelectedIndexChanged(object sender, EventArgs e)
{
SetData();
}
/// <summary>
/// 数据展示
/// </summary>
private void SetData()
{
string workPackageId = this.hdWorkPackageCode.Text;
string controlItemAndCycleId = this.cblControlItem.SelectedValue;
if (workPackageId == "1" || workPackageId == "2")
{
workPackageId = "Type" + workPackageId;
@ -83,6 +87,7 @@ namespace FineUIPro.Web.DigData
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
}
if (item == "CQMS")
@ -91,6 +96,7 @@ namespace FineUIPro.Web.DigData
var getDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x;
int all = getDetail.Count();
this.lbSpotCheck1.Text = all.ToString();

2
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs generated
View File

@ -120,7 +120,7 @@ namespace FineUIPro.Web.DigData
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBoxList cblControlItem;
protected global::FineUIPro.RadioButtonList cblControlItem;
/// <summary>
/// gpHSSE 控件。

51
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1,51 +0,0 @@
错误信息开始=====>
错误类型:ThreadAbortException
错误信息:正在中止线程。
错误堆栈:
在 SNIReadSyncOverAsync(SNI_ConnWrapper* , SNI_Packet** , Int32 )
在 SNINativeMethodWrapper.SNIReadSyncOverAsync(SafeHandle pConn, IntPtr& packet, Int32 timeout)
在 System.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
在 System.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
在 System.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer()
在 System.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.ExecuteReader()
在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\GetDataService.cs:行号 148
在 BLL.MonitorService.DoSynchData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 2129
在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 110
出错时间:08/30/2023 11:27:45
出错时间:08/30/2023 11:27:45
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 581
在 FineUIPro.Web.indexProject.btnJDGL_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 711
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/30/2023 14:19:32
出错文件:http://localhost:8797/indexProject.aspx?projectId=d93b0835-ffbd-4039-bed3-2df806adae56
IP地址:::1
出错时间:08/30/2023 14:19:32