lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
高飞
2024-09-04 08:50:30 +08:00
parent 05fdae93a8 0fc8d3af73
commit 3ca4765f80
117 changed files with 14139 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+1 -1
View File
@@ -109,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Check
string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
+ @" QualityQuestionType.QualityQuestionType as QuestionType,chec.LimitDate,"
+ @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
+ @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.userName "
+ @" unit.UnitName,unitWork.UnitWorkName,u.userName "
+ @" FROM Check_CheckControl chec"
+ @" left join Base_Unit unit on unit.unitId=chec.unitId"
+ @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode"
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
+1 -1
View File
@@ -388,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x;
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x;
var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+3
View File
@@ -17,6 +17,9 @@
color: Red;
font-size: small;
}
.f-grid-row.Gray {
background-color: gray;
}
</style>
</head>
<body>
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs
+9 -2
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.Comprehensive
{
string strSql = @"select InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status,
InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate,
InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode
InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode,C.IsOnSite
from Comprehensive_InspectionMachine C
left join Base_Unit U on C.UnitId=U.UnitId
left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.Comprehensive
DataRowView row = e.DataItem as DataRowView;
string IsVerification = row["IsVerification"].ToString();
string NextTestDate = row["NextTestDate"].ToString();
string InspectionType= row["InspectionType"].ToString();
string InspectionType = row["InspectionType"].ToString();
if (InspectionType == "计量")
{
if (IsVerification == "是" && !string.IsNullOrEmpty(NextTestDate)) //在校验期内
@@ -126,6 +126,13 @@ namespace FineUIPro.Web.Comprehensive
}
}
//离场为灰色
string LeaveDate = row["LeaveDate"].ToString();
string IsOnSite = row["IsOnSite"].ToString();
if (!string.IsNullOrEmpty(LeaveDate) || IsOnSite == "False")
{
e.RowCssClass = "Gray";
}
}
#region 查询
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
+3
View File
@@ -17,6 +17,9 @@
color: Red;
font-size: small;
}
.f-grid-row.Gray {
background-color: gray;
}
</style>
</head>
<body>
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
+9 -7
View File
@@ -301,25 +301,27 @@ namespace FineUIPro.Web.Comprehensive
{
DataRowView row = e.DataItem as DataRowView;
string ValidityDate = row["ValidityDate"].ToString();
if (!string.IsNullOrEmpty(ValidityDate))
{
if (DateTime.Compare(DateTime.Parse(ValidityDate).AddDays(-15), DateTime.Now) < 0)
{
// Grid1.Rows[e.RowIndex].RowCssClass = "Red";
//过期为红色
// Grid1.Rows[e.RowIndex].RowCssClass = "Red";
//过期为红色
e.RowCssClass = "Red";
}
}
else
{
e.RowCssClass = "Yellow";
}
//离场人员为灰色
string DepartureTime = row["DepartureTime"].ToString();
string IsOnSite = row["IsOnSite"].ToString();
if (!string.IsNullOrEmpty(DepartureTime) || IsOnSite == "False")
{
e.RowCssClass = "Gray";
}
}
/// <summary>
/// Grid行点击事件
SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs
+2 -2
View File
@@ -2287,7 +2287,7 @@ namespace FineUIPro.Web.CQMS.DataBase
private void WBSDataBind(string cNProfessionalCode)
{
this.tvWBS.Nodes.Clear();
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
foreach (var q in installations)
{
TreeNode newNode = new TreeNode();
@@ -2362,7 +2362,7 @@ namespace FineUIPro.Web.CQMS.DataBase
private void WBSDataBind2(string cNProfessionalCode)
{
this.tvWBS2.Nodes.Clear();
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
foreach (var q in installations)
{
TreeNode newNode = new TreeNode();
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
this.tvControlItem.AutoScroll = true;
this.tvControlItem.EnableSingleClickExpand = true;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
foreach (var item in unitWorks)
{
TreeNode rootNode1 = new TreeNode();
SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
this.tvControlItem.AutoScroll = true;
this.tvControlItem.EnableSingleClickExpand = true;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
foreach (var item in unitWorks)
{
TreeNode rootNode1 = new TreeNode();
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
<f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+6 -6
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
BindGrid();
}
}
@@ -59,10 +59,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
+ @" WHERE P.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (drpUnitWork.SelectedValue != BLL.Const._Null)
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql += " AND D.UnitWorkId=@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue));
strSql += " AND P.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
if (drpCNProfessional.SelectedValue != BLL.Const._Null)
{
@@ -251,9 +251,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
on x.InspectionId equals y.InspectionId
where y.ProjectId == this.CurrUser.LoginProjectId
select y);
if (drpUnitWork.SelectedValue != BLL.Const._Null)
if (drpUnit.SelectedValue != BLL.Const._Null)
{
lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue);
lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue);
}
if (drpCNProfessional.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs
Generated
+27 -29
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ProcessControl
{
public partial class InspectionManagement
{
namespace FineUIPro.Web.CQMS.ProcessControl {
public partial class InspectionManagement {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@@ -58,16 +56,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpUnitWork 控件。
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCNProfessional 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessional;
/// <summary>
/// txtStarTime 控件。
/// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelAlign="Right" LabelWidth="110px">
<f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+6 -6
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
BindGrid();
}
}
@@ -59,10 +59,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
+ @" WHERE P.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (drpUnitWork.SelectedValue != BLL.Const._Null)
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql += " AND D.UnitWorkId=@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue));
strSql += " AND P.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
if (drpCNProfessional.SelectedValue != BLL.Const._Null)
{
@@ -279,9 +279,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
on x.InspectionId equals y.InspectionId
where y.ProjectId == this.CurrUser.LoginProjectId
select y);
if (drpUnitWork.SelectedValue != BLL.Const._Null)
if (drpUnit.SelectedValue != BLL.Const._Null)
{
lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue);
lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue);
}
if (drpCNProfessional.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs
Generated
+2 -2
View File
@@ -58,13 +58,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpUnitWork 控件。
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCNProfessional 控件。
SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.trWBS.EnableIcons = true;
this.trWBS.AutoScroll = true;
this.trWBS.EnableSingleClickExpand = true;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
foreach (var q in unitWorks)
{
TreeNode newNode = new TreeNode();
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
+14
View File
@@ -25,6 +25,18 @@ namespace FineUIPro.Web.CQMS.WBS
ViewState["BreakdownProjectId"] = value;
}
}
public string UnitWorkId
{
get
{
return (string)ViewState["UnitWorkId"];
}
set
{
ViewState["UnitWorkId"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
@@ -38,6 +50,7 @@ namespace FineUIPro.Web.CQMS.WBS
var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
if (division != null)
{
this.UnitWorkId = division.UnitWorkId;
if (division.CNProfessionalId != null && Const.CNProfessionalConstructId == division.CNProfessionalId)
{
this.tr1.Hidden = false;
@@ -125,6 +138,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
}
newBreakdown.Remark = this.txtRemark.Text.Trim();
newBreakdown.UnitWorkId = this.UnitWorkId;
if (Request.Params["type"] == "add")
{
if (this.rblIsAcceptance.SelectedValue == "True")
SGGL/FineUIPro.Web/ErrLog.txt
+282
View File
@@ -0,0 +1,282 @@
错误信息开始=====>
错误类型:SqlException
错误信息:无法绑定由多个部分组成的标识符 "D.UnitWorkId"。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 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.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311
在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 83
在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 135
在 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)
出错时间:09/02/2024 10:32:29
出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionNotice.aspx
IP地址:::1
操作人员:JT
出错时间:09/02/2024 10:32:29
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'NextNum' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 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.Collections.Generic.IEnumerable<T>.GetEnumerator()
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
在 FineUIPro.Web.common.mainProject2.GetJD() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 720
在 FineUIPro.Web.common.mainProject2.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 113
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/25/2024 17:08:52
出错文件:http://localhost:8579/common/mainProject2.aspx
IP地址:::1
操作人员:JT
出错时间:06/25/2024 17:08:52
错误信息开始=====>
错误类型:SqlException
错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT NEWID() AS ID, CardNo,PersonNa' 需要参数 '@ProjectId'，但未提供该参数。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 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.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
在 FineUIPro.Web.HSSE.EduTrain.TrainFind.BindGrid() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 116
在 FineUIPro.Web.HSSE.EduTrain.TrainFind.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 59
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2024 15:38:17
出错文件:http://localhost:8579/HSSE/EduTrain/TrainFind.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:38:17
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
在 System.Convert.ToInt32(Object value)
在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
在 (GridColumn , GridRow )
在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
在 (GridRow )
在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
在 (Grid , Int32 , Object )
在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
在 (Grid , IEnumerable , Boolean )
在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
在 (Grid , Boolean )
在 FineUIPro.Grid.DataBind()
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.btnSearch_Click(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 39
在 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)
出错时间:09/03/2024 15:53:12
出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:53:12
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
在 System.Convert.ToInt32(Object value)
在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
在 (GridColumn , GridRow )
在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
在 (GridRow )
在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
在 (Grid , Int32 , Object )
在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
在 (Grid , IEnumerable , Boolean )
在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
在 (Grid , Boolean )
在 FineUIPro.Grid.DataBind()
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2024 15:53:47
出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:53:47
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
在 System.Convert.ToInt32(Object value)
在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
在 (GridColumn , GridRow )
在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
在 (GridRow )
在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
在 (Grid , Int32 , Object )
在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
在 (Grid , IEnumerable , Boolean )
在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
在 (Grid , Boolean )
在 FineUIPro.Grid.DataBind()
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2024 15:54:12
出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:54:12
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
在 System.Convert.ToInt32(Object value)
在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
在 (GridColumn , GridRow )
在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
在 (GridRow )
在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
在 (Grid , Int32 , Object )
在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
在 (Grid , IEnumerable , Boolean )
在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
在 (Grid , Boolean )
在 FineUIPro.Grid.DataBind()
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2024 15:54:41
出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:54:41
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
在 System.Convert.ToInt32(Object value)
在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
在 (GridColumn , GridRow )
在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
在 (GridRow )
在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
在 (Grid , Int32 , Object )
在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
在 (Grid , IEnumerable , Boolean )
在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
在 (Grid , Boolean )
在 FineUIPro.Grid.DataBind()
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2024 15:55:36
出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
IP地址:::1
操作人员:JT
出错时间:09/03/2024 15:55:36
SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/项目安全月报.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+17 -1
View File
@@ -1195,6 +1195,8 @@
<Content Include="HSSE\Manager\HSSELogMonthView.aspx" />
<Content Include="HSSE\Manager\HSSELogView.aspx" />
<Content Include="HSSE\Manager\ManagerMonthC.aspx" />
<Content Include="HSSE\Manager\ManagerMonthCEdit.aspx" />
<Content Include="HSSE\Manager\ManagerMonthCNew.aspx" />
<Content Include="HSSE\Manager\ManagerMonth_SeDin.aspx" />
<Content Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx" />
<Content Include="HSSE\Manager\ManagerWeek.aspx" />
@@ -12782,6 +12784,20 @@
<Compile Include="HSSE\Manager\ManagerMonthC.aspx.designer.cs">
<DependentUpon>ManagerMonthC.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonthCEdit.aspx.cs">
<DependentUpon>ManagerMonthCEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonthCEdit.aspx.designer.cs">
<DependentUpon>ManagerMonthCEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonthCNew.aspx.cs">
<DependentUpon>ManagerMonthCNew.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonthCNew.aspx.designer.cs">
<DependentUpon>ManagerMonthCNew.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonth_SeDin.aspx.cs">
<DependentUpon>ManagerMonth_SeDin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -19216,7 +19232,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
SGGL/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs
+2
View File
@@ -222,6 +222,8 @@ namespace FineUIPro.Web.HSSE.Emergency
var EmergencyTeamAndTrain = BLL.EmergencyTeamAndTrainService.GetEmergencyTeamAndTrainById(rowID);
if (EmergencyTeamAndTrain != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, EmergencyTeamAndTrain.FileCode, EmergencyTeamAndTrain.FileId, BLL.Const.ProjectEmergencyTeamAndTrainMenuId, BLL.Const.BtnDelete);
BLL.EmergencyTeamAndTrainService.DeleteEmergencyTeamAndTrainById(rowID);
}
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs
+4 -1
View File
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.HSSE.Manager
string strSql = @"SELECT MonthReport.MonthReportId,MonthReport.ProjectId,MonthReport.Months,CodeRecords.Code AS MonthReportCode,Users.UserName as ReportManName"
+ @" FROM Manager_MonthReportC AS MonthReport "
+ @" LEFT JOIN Sys_User AS Users ON MonthReport.ReportMan=Users.UserId "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON MonthReport.MonthReportId=CodeRecords.DataId WHERE 1=1 ";
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON MonthReport.MonthReportId=CodeRecords.DataId WHERE MonthReportType is null ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND MonthReport.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
@@ -236,7 +236,9 @@ namespace FineUIPro.Web.HSSE.Manager
var mont = BLL.MonthReportCService.GetMonthReportByMonthReportId(rowID);
if (mont != null)
{
BLL.ComplianceObligationsCService.DeleteComplianceObligationsCByMonthReportId(rowID);
BLL.LogService.AddSys_Log(this.CurrUser, mont.MonthReportCode, mont.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnDelete);
BLL.RewardAndPunishSortCService.DeleteRewardAndPunishSortCByMonthReportId(rowID);
BLL.PersonSortCService.DeletePersonSortsByMonthReportId(rowID);
BLL.HazardSortCService.DeleteHazardSortsByMonthReportId(rowID);
BLL.AccidentSortCService.DeleteAccidentSortsByMonthReportId(rowID);
@@ -272,6 +274,7 @@ namespace FineUIPro.Web.HSSE.Manager
BLL.ManageDocPlanCService.DeleteManageDocPlanByMonthReportId(rowID);
BLL.OtherWorkPlanCService.DeleteOtherWorkPlanByMonthReportId(rowID);
BLL.MonthReportCService.DeleteMonthReportByMonthReportId(rowID);
}
}
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
+1467
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
+3217
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs
Generated
+2141
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx
+123
View File
@@ -0,0 +1,123 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerMonthCNew.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.ManagerMonthCNew" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>HSE月报告（新）</title>
<style type="text/css">
.labcenter
{
text-align: center;
}
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSE月报告" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="MonthReportId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true" SortField="Months"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtMonthReportCode" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DatePicker runat="server" Label="选择月份" ID="txtReportDate" LabelWidth="100px" Width="200px"
LabelAlign="right" DateFormatString="yyyy-MM">
</f:DatePicker>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server"
OnClick="btnNew_Click1" Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="250px" ColumnID="MonthReportCode" DataField="MonthReportCode"
SortField="MonthReportCode" FieldType="String" HeaderText="编号" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="210px" ColumnID="Months" DataField="Months" SortField="Months"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="190px" ColumnID="ReportManName" DataField="ReportManName" ExpandUnusedSpace="true"
SortField="ReportManName" FieldType="String" HeaderText="报告人" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑HSE月报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" CloseAction="HidePostBack"
PercentWidth="100%" PercentHeight="100%">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuOut" EnablePostBack="true" runat="server" EnableAjax="false" DisableControlBeforePostBack="false"
Text="导出" Icon="Find" OnClick="btnMenuOut_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
+1940
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.designer.cs
Generated
+188
View File
@@ -0,0 +1,188 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Manager
{
public partial class ManagerMonthCNew
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMonthReportCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMonthReportCode;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// txtReportDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtReportDate;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuOut;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDel;
}
}
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+2 -2
View File
@@ -198,7 +198,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
where x.ProjectId == this.ProjectId
select x;
var workAreas = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId
where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_WorkPost
select x;
@@ -727,7 +727,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
where x.ProjectId == this.ProjectId
select x;
var workAreas = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId
where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_WorkPost
select x;
SGGL/FineUIPro.Web/Images/Logo1.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 138 KiB

SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs
+2 -2
View File
@@ -97,8 +97,8 @@ namespace FineUIPro.Web.ProjectData
if (e.Node.CommandName == "project") //展开项目节点
{
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == e.Node.NodeID && x.SuperUnitWork == "0"
orderby x.UnitWorkCode
where x.ProjectId == e.Node.NodeID && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
foreach (var unitWork in unitWorks)
{
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+244 -25
View File
@@ -49,16 +49,19 @@
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="650px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
<Tabs>
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" CssStyle="width:100%"
TitleToolTip="图形">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
<div id="divAccidentTime">
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0" CssStyle="width:100%">
<div id="container" style="width: 1300px; height: 580px;"></div>
<%-- <div id="divAccidentTime">
<uc1:ChartControl ID="ChartAccidentTime" runat="server" />
</div>
</div>--%>
</f:ContentPanel>
</Items>
</f:Tab>
@@ -80,13 +83,52 @@
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" MinWidth="150px" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" minWidth="80px" TextAlign="Center"/>
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
@@ -112,14 +154,51 @@
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid2_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" MinWidth="150px" />
<f:RenderField Width="150px" ColumnID="Cat_All_Count" DataField="Cat_All_Count" HeaderText="汇总" TextAlign="Center" FieldType="Double" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" minWidth="80px" TextAlign="Center" />
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
@@ -145,20 +224,57 @@
runat="server" BoxFlex="1" DataKeyNames="System_No" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid3_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true">
<Columns>
<f:BoundField Width="180px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
<f:BoundField TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." minWidth="80px" />
<f:RenderField Width="180px" TextAlign="Center" ColumnID="SystemNoCount" DataField="SystemNoCount" HeaderText="尾项数量" FieldType="Double" />
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ActualDateCount" DataField="ActualDateCount" HeaderText="已完成数量" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ClearedByCount" DataField="ClearedByCount" HeaderText="Cleared(PIC)" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ConfirmedByCount" DataField="ConfirmedByCount" HeaderText="Confirmed(WUH)" FieldType="Double"/>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="VerifiedByCount" DataField="VerifiedByCount" HeaderText="Verified(BASF)" FieldType="Double"/>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
@@ -181,3 +297,106 @@
</form>
</body>
</html>
<script type="text/javascript" src="https://registry.npmmirror.com/echarts/5.5.1/files/dist/echarts.min.js"></script>
<script type="text/javascript">
var dom = document.getElementById('container');
var myChart = echarts.init(dom, null, {
renderer: 'canvas',
useDirtyRect: false
});
var app = {};
var option;
option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
}
},
toolbox: {
feature: {
//dataView: { show: true, readOnly: false },
//magicType: { show: true, type: ['line', 'bar'] },
//restore: { show: true },
saveAsImage: { show: true }
}
},
legend: {
data: ['当天计划完成量', '当天实际完成量', '累计计划完成量','累计实际完成量']
},
/*x轴日期*/
xAxis: [
{
type: 'category',
data: [<%=AllxDate%>],
/* data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],*/
axisPointer: {
type: 'shadow'
},
axisLabel: {
interval: 0,
rotate: 40 //值>0向右倾斜，值<0则向左倾斜
}
}
],
/*两边的单位*/
yAxis: [
{
type: 'value',
name: '计划数量',
interval: 20,
axisLabel: {
formatter: '{value}'
}
},
{
type: 'value',
name: '累计数量',
interval: 50,
axisLabel: {
formatter: '{value}'
}
}
],
series: [
{
name: '当天计划完成量',
type: 'bar',
data: [<%=wcl1%>]
},
{
name: '当天实际完成量',
type: 'bar',
data: [<%=wcl2%>]
},
{
name: '累计计划完成量',
type: 'line',
yAxisIndex: 1,
data: [<%=wcl3%>]
},
{
name: '累计实际完成量',
type: 'line',
yAxisIndex: 1,
data: [<%=wcl4%>]
}
]
};
if (option && typeof option === 'object') {
myChart.setOption(option);
}
window.addEventListener('resize', myChart.resize);
</script>
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+423 -63
View File
@@ -18,6 +18,11 @@ namespace FineUIPro.Web.Transfer.Chart
{
if (!IsPostBack)
{
ddlSystemNo.Hidden = true;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BtnAnalyse.Hidden = true;
var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
int indexRow = 1;
ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
@@ -30,6 +35,28 @@ namespace FineUIPro.Web.Transfer.Chart
}
}
/// <summary>
/// x轴30天日期
/// </summary>
public string AllxDate;
/// <summary>
/// 当天计划完成量
/// </summary>
public string wcl1;
/// <summary>
/// 当天实际完成量
/// </summary>
public string wcl2;
/// <summary>
/// 累计计划完成量
/// </summary>
public string wcl3;
/// <summary>
/// 累计实际完成量
/// </summary>
public string wcl4;
/// <summary>
/// 统计方法
/// </summary>
@@ -47,27 +74,63 @@ namespace FineUIPro.Web.Transfer.Chart
string _dateType = ddlDateType.SelectedValue;
#region 按照当前日期前一周数据
AllxDate = "";
if (_dateType == "1")
{
///按单位统计
DataTable dtTime = new DataTable();
dtTime.Columns.Add("日期", typeof(string));
dtTime.Columns.Add("计划完成数量", typeof(string));
dtTime.Columns.Add("实际完成数量", typeof(string));
for (int i = 6; i >= 0; i--)
#region 加载尾项完成统计表（30天以内）
var nowDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
for (var i = nowDate.AddDays(-30); i <= nowDate; i=i.AddDays(1))
{
DataRow rowTime = dtTime.NewRow();
DateTime QueryTime = DateTime.Now.AddDays(i * -1);
rowTime["日期"] = QueryTime.ToString("yyyy/MM/dd");
DateTime startTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 00:00:00");
DateTime endTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 23:59:59");
//rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
//rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
rowTime["计划完成数量"] = forms.Where(x => x.Required_Date <= endTime).Count();
rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date <= endTime).Count();
dtTime.Rows.Add(rowTime);
//i是日期
var d = i.Month.ToString() + "月" + i.Day.ToString() + "日";
DateTime startTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 00:00:00");
DateTime endTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 23:59:59");
//当天计划完成量
var dtjhwcl= forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
wcl1 += "'" + dtjhwcl + "',";
//当天实际完成量
var dtsjwcl = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
wcl2 += "'" + dtsjwcl + "',";
//累计计划完成量
var ljjhwcl = forms.Where(x => x.Required_Date <= endTime).Count();
wcl3 += "'" + ljjhwcl + "',";
//累计实际完成量
var ljsjwcl= forms.Where(x => x.Actual_Date <= endTime).Count();
wcl4 += "'" + ljsjwcl + "',";
AllxDate += "'"+ d + "',";
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
if (AllxDate.Length>0)
{
AllxDate = AllxDate.Substring(0, AllxDate.Length - 1);
wcl1 = wcl1.Substring(0, wcl1.Length - 1);
wcl2 = wcl2.Substring(0, wcl2.Length - 1);
wcl3 = wcl3.Substring(0, wcl3.Length - 1);
wcl4 = wcl4.Substring(0, wcl4.Length - 1);
}
#endregion
/////按单位统计
//DataTable dtTime = new DataTable();
//dtTime.Columns.Add("日期", typeof(string));
//dtTime.Columns.Add("计划完成数量", typeof(string));
//dtTime.Columns.Add("实际完成数量", typeof(string));
//for (int i = 6; i >= 0; i--)
//{
// DataRow rowTime = dtTime.NewRow();
// DateTime QueryTime = DateTime.Now.AddDays(i * -1);
// rowTime["日期"] = QueryTime.ToString("yyyy/MM/dd");
// DateTime startTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 00:00:00");
// DateTime endTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 23:59:59");
// //rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
// //rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
// rowTime["计划完成数量"] = forms.Where(x => x.Required_Date <= endTime).Count();
// rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date <= endTime).Count();
// dtTime.Rows.Add(rowTime);
//}
//this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
///按单位统计
DataTable dtTime1 = new DataTable();
@@ -95,25 +158,25 @@ namespace FineUIPro.Web.Transfer.Chart
//按照当前月份到一月份的数据
if (_dateType == "2")
{
///按单位统计
DataTable dtTime = new DataTable();
dtTime.Columns.Add("月份", typeof(string));
dtTime.Columns.Add("计划完成数量", typeof(string));
dtTime.Columns.Add("实际完成数量", typeof(string));
for (int i = 1; i <= DateTime.Now.Month; i++)
{
DataRow rowTime = dtTime.NewRow();
DateTime QueryTime =Convert.ToDateTime($"{DateTime.Now.Year.ToString()}-{i}-1 00:00:00");
rowTime["月份"] = QueryTime.ToString("yyyy/MM");
DateTime startTime = QueryTime;
DateTime endTime = Convert.ToDateTime(QueryTime.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59");
//rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
//rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
rowTime["计划完成数量"] = forms.Where(x => x.Required_Date <= endTime).Count();
rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date <= endTime).Count();
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
/////按单位统计
//DataTable dtTime = new DataTable();
//dtTime.Columns.Add("月份", typeof(string));
//dtTime.Columns.Add("计划完成数量", typeof(string));
//dtTime.Columns.Add("实际完成数量", typeof(string));
//for (int i = 1; i <= DateTime.Now.Month; i++)
//{
// DataRow rowTime = dtTime.NewRow();
// DateTime QueryTime =Convert.ToDateTime($"{DateTime.Now.Year.ToString()}-{i}-1 00:00:00");
// rowTime["月份"] = QueryTime.ToString("yyyy/MM");
// DateTime startTime = QueryTime;
// DateTime endTime = Convert.ToDateTime(QueryTime.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59");
// //rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
// //rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
// rowTime["计划完成数量"] = forms.Where(x => x.Required_Date <= endTime).Count();
// rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date <= endTime).Count();
// dtTime.Rows.Add(rowTime);
//}
//this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
///按单位统计
DataTable dtTime1 = new DataTable();
@@ -269,12 +332,49 @@ namespace FineUIPro.Web.Transfer.Chart
strSql.AppendLine(" AND System_No=@System_No ");
listStr.Add(new SqlParameter("@System_No", _systemNo));
}
strSql.AppendLine(" select Disc,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp1 from #AllPunchlistFromSortTemp1 Group by Disc; ");
strSql.AppendLine(" update a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
strSql.AppendLine("from #PunchlistFromSortTemp1 a;");
strSql.AppendLine(@" select Disc,
cast(0 as decimal(18, 2)) Cat_A_Count,
cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Count,
cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Count,
cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_D_Count,
cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
INTO #PunchlistFromSortTemp1
from #AllPunchlistFromSortTemp1 Group by Disc; ");
strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc),
allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Required_Date is not null or b.Required_Date!='')),
allWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
from #PunchlistFromSortTemp1 a;");
strSql.AppendLine("select * from #PunchlistFromSortTemp1 ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql.AppendLine(" order by Disc ");
@@ -290,12 +390,39 @@ namespace FineUIPro.Web.Transfer.Chart
int cat_B_Count = 0;
int cat_C_Count = 0;
int cat_D_Count = 0;
int Cat_A_Countf = 0, Cat_A_CountWUH = 0, Cat_A_CountBASF = 0,
Cat_B_Countf = 0, Cat_B_CountWUH = 0, Cat_B_CountBASF = 0,
Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 0;
foreach (DataRow row in tb.Rows)
{
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
//
Cat_A_Countf+= Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
Cat_B_Countf += Convert.ToInt32(row["Cat_B_Countf"]);
Cat_B_CountWUH += Convert.ToInt32(row["Cat_B_CountWUH"]);
Cat_B_CountBASF += Convert.ToInt32(row["Cat_B_CountBASF"]);
Cat_C_Countf += Convert.ToInt32(row["Cat_C_Countf"]);
Cat_C_CountWUH += Convert.ToInt32(row["Cat_C_CountWUH"]);
Cat_C_CountBASF += Convert.ToInt32(row["Cat_C_CountBASF"]);
Cat_D_Countf += Convert.ToInt32(row["Cat_D_Countf"]);
Cat_D_CountWUH += Convert.ToInt32(row["Cat_D_CountWUH"]);
Cat_D_CountBASF += Convert.ToInt32(row["Cat_D_CountBASF"]);
allCount += Convert.ToInt32(row["allCount"]);
allfinshedCount += Convert.ToInt32(row["allfinshedCount"]);
allWUH += Convert.ToInt32(row["allWUH"]);
allBASF += Convert.ToInt32(row["allBASF"]);
}
@@ -306,6 +433,27 @@ namespace FineUIPro.Web.Transfer.Chart
summary.Add("Cat_C_Count", cat_C_Count.ToString());
summary.Add("Cat_D_Count", cat_D_Count.ToString());
summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
summary.Add("allCount", allCount.ToString());
summary.Add("allfinshedCount", allfinshedCount.ToString());
summary.Add("allWUH", allWUH.ToString());
summary.Add("allBASF", allBASF.ToString());
Grid1.SummaryData = summary;
}
@@ -327,13 +475,50 @@ namespace FineUIPro.Web.Transfer.Chart
strSql.AppendLine(" AND System_No=@System_No ");
listStr.Add(new SqlParameter("@System_No", _systemNo));
}
strSql.AppendLine(" select Action_By,cast(0 as decimal(18,2)) Cat_All_Count,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp2 from #AllPunchlistFromSortTemp2 Group by Action_By; ");
strSql.AppendLine(" update a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
strSql.AppendLine("from #PunchlistFromSortTemp2 a;");
strSql.AppendLine(" update #PunchlistFromSortTemp2 set Cat_All_Count=Cat_A_Count+Cat_B_Count+Cat_C_Count+Cat_D_Count; ");
strSql.AppendLine(@" select Action_By,
cast(0 as decimal(18, 2)) Cat_A_Count,
cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Count,
cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Count,
cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_D_Count,
cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
INTO #PunchlistFromSortTemp2
from #AllPunchlistFromSortTemp2 Group by Action_By; ");
strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By),
allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Required_Date is not null or b.Required_Date!='')),
allWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
from #PunchlistFromSortTemp2 a;");
strSql.AppendLine("select * from #PunchlistFromSortTemp2 ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql.AppendLine(" order by Action_By ");
@@ -349,36 +534,90 @@ namespace FineUIPro.Web.Transfer.Chart
int cat_B_Count = 0;
int cat_C_Count = 0;
int cat_D_Count = 0;
int cat_All_Count = 0;
int Cat_A_Countf = 0, Cat_A_CountWUH = 0, Cat_A_CountBASF = 0,
Cat_B_Countf = 0, Cat_B_CountWUH = 0, Cat_B_CountBASF = 0,
Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 0;
foreach (DataRow row in tb.Rows)
{
cat_All_Count += Convert.ToInt32(row["Cat_All_Count"]);
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
//
Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
Cat_B_Countf += Convert.ToInt32(row["Cat_B_Countf"]);
Cat_B_CountWUH += Convert.ToInt32(row["Cat_B_CountWUH"]);
Cat_B_CountBASF += Convert.ToInt32(row["Cat_B_CountBASF"]);
Cat_C_Countf += Convert.ToInt32(row["Cat_C_Countf"]);
Cat_C_CountWUH += Convert.ToInt32(row["Cat_C_CountWUH"]);
Cat_C_CountBASF += Convert.ToInt32(row["Cat_C_CountBASF"]);
Cat_D_Countf += Convert.ToInt32(row["Cat_D_Countf"]);
Cat_D_CountWUH += Convert.ToInt32(row["Cat_D_CountWUH"]);
Cat_D_CountBASF += Convert.ToInt32(row["Cat_D_CountBASF"]);
allCount += Convert.ToInt32(row["allCount"]);
allfinshedCount += Convert.ToInt32(row["allfinshedCount"]);
allWUH += Convert.ToInt32(row["allWUH"]);
allBASF += Convert.ToInt32(row["allBASF"]);
}
JObject summary = new JObject();
summary.Add("Action_By", "合计");
summary.Add("Cat_All_Count", cat_All_Count.ToString());
summary.Add("Cat_A_Count", cat_A_Count.ToString());
summary.Add("Cat_B_Count", cat_B_Count.ToString());
summary.Add("Cat_C_Count", cat_C_Count.ToString());
summary.Add("Cat_D_Count", cat_D_Count.ToString());
summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
summary.Add("allCount", allCount.ToString());
summary.Add("allfinshedCount", allfinshedCount.ToString());
summary.Add("allWUH", allWUH.ToString());
summary.Add("allBASF", allBASF.ToString());
Grid2.SummaryData = summary;
}
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
if (TabStrip1.ActiveTabIndex == 2)
if (TabStrip1.ActiveTabIndex ==0)
{
ddlSystemNo.Hidden = true;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BtnAnalyse.Hidden = true;
}
else if (TabStrip1.ActiveTabIndex == 2)
{
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BtnAnalyse.Hidden = false;
BindGrid1();
}
else if (TabStrip1.ActiveTabIndex == 3)
@@ -386,6 +625,7 @@ namespace FineUIPro.Web.Transfer.Chart
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BtnAnalyse.Hidden = false;
BindGrid2();
}
else if (TabStrip1.ActiveTabIndex == 4)
@@ -393,6 +633,7 @@ namespace FineUIPro.Web.Transfer.Chart
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
ddlSystemNo.Hidden = true;
BtnAnalyse.Hidden = false;
BindGrid3();
}
else {
@@ -400,6 +641,7 @@ namespace FineUIPro.Web.Transfer.Chart
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = false;
drpChartType.Hidden = false;
BtnAnalyse.Hidden = false;
}
}
#endregion
@@ -413,16 +655,62 @@ namespace FineUIPro.Web.Transfer.Chart
StringBuilder strSql = new StringBuilder("");
strSql.AppendLine("IF OBJECT_ID('tempdb..#AllPunchlistFromProgressTemp') IS NOT NULL drop table #AllPunchlistFromProgressTemp; ");
strSql.AppendLine("IF OBJECT_ID('tempdb..#PunchlistFromProgressTemp') IS NOT NULL drop table #PunchlistFromProgressTemp; ");
strSql.AppendLine(" select System_No,Actual_Date,Cleared_By,Confirmed_By,Verified_By,ProjectId ");
strSql.AppendLine(" INTO #AllPunchlistFromProgressTemp from Transfer_PunchlistFrom where ProjectId = @ProjectId ");
strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
strSql.AppendLine(" update a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'') ");
strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'') ");
strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
strSql.AppendLine(" from #PunchlistFromProgressTemp a ");
strSql.AppendLine(" select * INTO #AllPunchlistFromProgressTemp from Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
//strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
//strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
//strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
//strSql.AppendLine(" update a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'') ");
//strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
//strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'') ");
//strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
strSql.AppendLine(@" select System_No,
cast(0 as decimal(18, 2)) Cat_A_Count,
cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Count,
cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Count,
cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_D_Count,
cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
INTO #PunchlistFromProgressTemp
from #AllPunchlistFromProgressTemp Group by System_No; ");
strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No),
allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Required_Date is not null or b.Required_Date!='')),
allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
from #PunchlistFromProgressTemp a;");
strSql.AppendLine(" select * from #PunchlistFromProgressTemp ");
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -434,6 +722,78 @@ namespace FineUIPro.Web.Transfer.Chart
var table = this.GetPagedDataTable(Grid1, tb);
Grid3.DataSource = table;
Grid3.DataBind();
//合计
int cat_A_Count = 0;
int cat_B_Count = 0;
int cat_C_Count = 0;
int cat_D_Count = 0;
int Cat_A_Countf = 0, Cat_A_CountWUH = 0, Cat_A_CountBASF = 0,
Cat_B_Countf = 0, Cat_B_CountWUH = 0, Cat_B_CountBASF = 0,
Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 0;
foreach (DataRow row in tb.Rows)
{
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
//
Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
Cat_B_Countf += Convert.ToInt32(row["Cat_B_Countf"]);
Cat_B_CountWUH += Convert.ToInt32(row["Cat_B_CountWUH"]);
Cat_B_CountBASF += Convert.ToInt32(row["Cat_B_CountBASF"]);
Cat_C_Countf += Convert.ToInt32(row["Cat_C_Countf"]);
Cat_C_CountWUH += Convert.ToInt32(row["Cat_C_CountWUH"]);
Cat_C_CountBASF += Convert.ToInt32(row["Cat_C_CountBASF"]);
Cat_D_Countf += Convert.ToInt32(row["Cat_D_Countf"]);
Cat_D_CountWUH += Convert.ToInt32(row["Cat_D_CountWUH"]);
Cat_D_CountBASF += Convert.ToInt32(row["Cat_D_CountBASF"]);
allCount += Convert.ToInt32(row["allCount"]);
allfinshedCount += Convert.ToInt32(row["allfinshedCount"]);
allWUH += Convert.ToInt32(row["allWUH"]);
allBASF += Convert.ToInt32(row["allBASF"]);
}
JObject summary = new JObject();
summary.Add("System_No", "合计");
summary.Add("Cat_A_Count", cat_A_Count.ToString());
summary.Add("Cat_B_Count", cat_B_Count.ToString());
summary.Add("Cat_C_Count", cat_C_Count.ToString());
summary.Add("Cat_D_Count", cat_D_Count.ToString());
summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
summary.Add("allCount", allCount.ToString());
summary.Add("allfinshedCount", allfinshedCount.ToString());
summary.Add("allWUH", allWUH.ToString());
summary.Add("allBASF", allBASF.ToString());
Grid3.SummaryData = summary;
}
/// <summary>
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
Generated
-9
View File
@@ -122,15 +122,6 @@ namespace FineUIPro.Web.Transfer.Chart
/// </remarks>
protected global::FineUIPro.ContentPanel cpAccidentTime;
/// <summary>
/// ChartAccidentTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartAccidentTime;
/// <summary>
/// Tab2 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+6 -6
View File
@@ -75,21 +75,21 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
<Columns>
<f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Foundation" TextAlign="Center"
<f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Construction" TextAlign="Center"
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="Main structure<br/> acceptance" TextAlign="Center"
<f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="CQVD" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Roof sub-project" TextAlign="Center"
<%-- <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Roof sub-project" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</f:RenderField>--%>
<%-- <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
HeaderTextAlign="Center" minWidth="120px">
@@ -107,9 +107,9 @@
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>--%>
<f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
<%-- <f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
HeaderTextAlign="Center" minWidth="100px">
</f:RenderField>
</f:RenderField>--%>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+10 -10
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 10);
AddDatasetToSQL(ds.Tables[0], 7);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 10);
AddDatasetToSQL2(ds.Tables[0], 7);
}
catch (Exception ex)
{
@@ -330,18 +330,18 @@ namespace FineUIPro.Web.Transfer
var obj1 = model.Foundation = pds.Rows[i][5].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][6].ToString().Trim();
var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
//var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
//var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
//var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//listObj.Add(obj3);
//listObj.Add(obj4);
//listObj.Add(obj5);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -350,7 +350,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
{
model.FINAL_Status = "Not Start";
list.Add(model);
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
+6 -6
View File
@@ -50,21 +50,21 @@
<Items>
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items>
<f:DropDownList ID="ddlFoundation" runat="server" Label="Foundation" LabelWidth="180px">
<f:DropDownList ID="ddlFoundation" runat="server" Label="Construction" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlMainstructure" runat="server" Label="Main structure acceptance" LabelWidth="180px">
<f:DropDownList ID="ddlMainstructure" runat="server" Label="CQVD" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlEquipment" runat="server" Label="Roof sub-project" LabelWidth="180px">
<%-- <f:DropDownList ID="ddlEquipment" runat="server" Label="Roof sub-project" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -76,7 +76,7 @@
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
</f:DropDownList>--%>
@@ -101,12 +101,12 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>--%>
<f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
<%-- <f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
</f:DropDownList>--%>
</Items>
</f:GroupPanel>
</Items>
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
+14 -14
View File
@@ -56,13 +56,13 @@ namespace FineUIPro.Web.Transfer
txtTest_Package.Text = model.Test_Package;
ddlFoundation.SelectedValue = model.Foundation;
ddlMainstructure.SelectedValue = model.Mainstructure;
ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
ddlEquipment.SelectedValue = model.Equipment;
//ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
//ddlEquipment.SelectedValue = model.Equipment;
//ddlInstrument.SelectedValue = model.Instrument;
//ddlElectrical.SelectedValue = model.Electrical;
//ddlFireFighting.SelectedValue = model.FireFighting;
ddlHVAC.SelectedValue = model.HVAC;
//ddlHVAC.SelectedValue = model.HVAC;
txtDescriptions.Text = model.Descriptions;
}
}
@@ -80,13 +80,13 @@ namespace FineUIPro.Web.Transfer
Test_Package = txtTest_Package.Text,
Foundation = ddlFoundation.SelectedValue,
Mainstructure = ddlMainstructure.SelectedValue,
Buildingdecoration = ddlBuildingdecoration.SelectedValue,
Equipment = ddlEquipment.SelectedValue,
//Buildingdecoration = ddlBuildingdecoration.SelectedValue,
//Equipment = ddlEquipment.SelectedValue,
//Instrument = ddlInstrument.SelectedValue,
//Electrical = ddlElectrical.SelectedValue,
//FireFighting = ddlFireFighting.SelectedValue,
HVAC = ddlHVAC.SelectedValue,
//HVAC = ddlHVAC.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -95,19 +95,19 @@ namespace FineUIPro.Web.Transfer
var listObj = new List<string>();
listObj.Add(model.Foundation);
listObj.Add(model.Mainstructure);
listObj.Add(model.Buildingdecoration);
listObj.Add(model.Equipment);
//listObj.Add(model.Buildingdecoration);
//listObj.Add(model.Equipment);
//listObj.Add(model.Instrument);
//listObj.Add(model.Electrical);
//listObj.Add(model.FireFighting);
listObj.Add(model.HVAC);
//listObj.Add(model.HVAC);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
{
model.FINAL_Status = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
{
model.FINAL_Status = "Not Start";
}
@@ -130,13 +130,13 @@ namespace FineUIPro.Web.Transfer
newModel.Test_Package = txtTest_Package.Text;
newModel.Foundation = ddlFoundation.SelectedValue;
newModel.Mainstructure = ddlMainstructure.SelectedValue;
newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
newModel.Equipment = ddlEquipment.SelectedValue;
//newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
//newModel.Equipment = ddlEquipment.SelectedValue;
//newModel.Instrument = ddlInstrument.SelectedValue;
//newModel.Electrical = ddlElectrical.SelectedValue;
//newModel.FireFighting = ddlFireFighting.SelectedValue;
newModel.HVAC = ddlHVAC.SelectedValue;
//newModel.HVAC = ddlHVAC.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
Generated
-27
View File
@@ -104,33 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlMainstructure;
/// <summary>
/// ddlEquipment 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlEquipment;
/// <summary>
/// ddlBuildingdecoration 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlBuildingdecoration;
/// <summary>
/// ddlHVAC 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlHVAC;
/// <summary>
/// Toolbar1 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+5 -1
View File
@@ -76,7 +76,11 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation<br/> &Calibration " TextAlign="Center"
<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+11 -9
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 10);
AddDatasetToSQL(ds.Tables[0], 11);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 10);
AddDatasetToSQL2(ds.Tables[0], 11);
}
catch (Exception ex)
{
@@ -327,11 +327,12 @@ namespace FineUIPro.Web.Transfer
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][7 + 1].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][8 + 1].ToString().Trim();
var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
@@ -339,8 +340,9 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj0);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -349,7 +351,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
{
model.FINAL_Status = "Not Start";
list.Add(model);
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
+8 -1
View File
@@ -50,7 +50,14 @@
<Items>
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items>
<f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation&Calibration" LabelWidth="180px">
<f:DropDownList ID="ddlCalibration" runat="server" Label="Calibration" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+6 -2
View File
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.Transfer
ddlPipingLeak.SelectedValue = model.PipingLeak;
ddlPipingBlowing.SelectedValue = model.PipingBlowing;
ddlLooptest.SelectedValue = model.Looptest;
ddlCalibration.SelectedValue = model.Calibration;
txtDescriptions.Text = model.Descriptions;
}
}
@@ -80,6 +81,7 @@ namespace FineUIPro.Web.Transfer
PipingLeak = ddlPipingLeak.SelectedValue,
PipingBlowing = ddlPipingBlowing.SelectedValue,
Looptest = ddlLooptest.SelectedValue,
Calibration= ddlCalibration.SelectedValue,
Descriptions = txtDescriptions.Text
};
@@ -91,13 +93,14 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.PipingLeak);
listObj.Add(model.PipingBlowing);
listObj.Add(model.Looptest);
listObj.Add(model.Calibration);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
{
model.FINAL_Status = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
{
model.FINAL_Status = "Not Start";
}
@@ -123,6 +126,7 @@ namespace FineUIPro.Web.Transfer
newModel.PipingLeak = ddlPipingLeak.SelectedValue;
newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
newModel.Looptest = ddlLooptest.SelectedValue;
newModel.Calibration = ddlCalibration.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
Generated
+9
View File
@@ -86,6 +86,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlCalibration 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlCalibration;
/// <summary>
/// ddlInstallationCalibration 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Piping.aspx
+6 -2
View File
@@ -72,7 +72,7 @@
</Columns>
</f:GroupField>
<f:GroupField ID="g3" HeaderText="Ready for Test " HeaderTextAlign="Center">
<%--<f:GroupField ID="g3" HeaderText="Ready for Test " HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="PWD" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
@@ -94,10 +94,14 @@
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="Ready for Test" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="HydrostaticTest" DataField="HydrostaticTest" FieldType="String" HeaderText="Hydrostatic Test<br/>(Golden joint) " TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
Generated
-9
View File
@@ -131,15 +131,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.GroupField g2;
/// <summary>
/// g3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g3;
/// <summary>
/// g4 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+18 -18
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 10);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 10);
}
catch (Exception ex)
{
@@ -322,30 +322,30 @@ namespace FineUIPro.Web.Transfer
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.PWD= pds.Rows[i][4 + 1].ToString().Trim();
var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][9 + 1].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][10].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][11 + 1].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][12 + 1].ToString().Trim();
model.BlowingReport= pds.Rows[i][13].ToString().Trim();
//var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
//var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
//var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
//var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][6].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][7].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
model.BlowingReport= pds.Rows[i][10].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//listObj.Add(obj2);
//listObj.Add(obj3);
//listObj.Add(obj4);
//listObj.Add(obj10);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
listObj.Add(obj9);
//全是NA或Completed 状态是Completed
if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==9)
if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==5)
{
model.FINALStatus = "Completed";
list.Add(model);
@@ -354,7 +354,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x=>x== "Not Start").ToList().Count==9)
if (listObj.Where(x=>x== "Not Start").ToList().Count==5)
{
model.FINALStatus = "Not Start";
list.Add(model);
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
+9 -2
View File
@@ -45,7 +45,7 @@
</f:FormRow>
<f:FormRow>
<%--<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Ready for Test" runat="server">
<Items>
@@ -86,12 +86,19 @@
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Hydrostatic test schedule" runat="server">
<Items>
<f:DropDownList ID="ddlPWD" runat="server" Label="Ready for Test" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlHydrostaticTest" runat="server" Label="Hydrostatic Test" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+19 -18
View File
@@ -54,13 +54,13 @@ namespace FineUIPro.Web.Transfer
txtSubsystem.Text = model.Subsystem;
txtTestPackage.Text = model.TestPackage;
ddlPWD.SelectedValue = model.PWD;
ddlApunchclosed.SelectedValue = model.Apunchclosed;
ddlNDTReport.SelectedValue = model.NDTReport;
ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
//ddlApunchclosed.SelectedValue = model.Apunchclosed;
//ddlNDTReport.SelectedValue = model.NDTReport;
//ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
ddlReport.SelectedValue = model.Report;
ddlBlowingflushing.SelectedValue = model.Blowingflushing;
ddlFWDfinished.SelectedValue = model.FWDfinished;
//ddlFWDfinished.SelectedValue = model.FWDfinished;
ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
txtBlowingReport.Text = model.BlowingReport;
@@ -78,13 +78,13 @@ namespace FineUIPro.Web.Transfer
Subsystem = txtSubsystem.Text,
TestPackage = txtTestPackage.Text,
PWD = ddlPWD.SelectedValue,
Apunchclosed = ddlApunchclosed.SelectedValue,
NDTReport= ddlNDTReport.SelectedValue,
TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
//Apunchclosed = ddlApunchclosed.SelectedValue,
//NDTReport= ddlNDTReport.SelectedValue,
//TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
HydrostaticTest=ddlHydrostaticTest.SelectedValue,
Report= ddlReport.SelectedValue,
Blowingflushing= ddlBlowingflushing.SelectedValue,
FWDfinished= ddlFWDfinished.SelectedValue,
//FWDfinished= ddlFWDfinished.SelectedValue,
Systemreinstalled= ddlSystemreinstalled.SelectedValue,
BlowingReport= txtBlowingReport.Text,
Descriptions= txtDescriptions.Text
@@ -92,22 +92,23 @@ namespace FineUIPro.Web.Transfer
#region 判断状态
var listObj = new List<string>();
listObj.Add(model.PWD);
listObj.Add(model.Apunchclosed);
listObj.Add(model.NDTReport);
listObj.Add(model.TemperaryMeasurement);
//listObj.Add(model.Apunchclosed);
//listObj.Add(model.NDTReport);
//listObj.Add(model.TemperaryMeasurement);
listObj.Add(model.HydrostaticTest);
listObj.Add(model.Report);
listObj.Add(model.Blowingflushing);
listObj.Add(model.FWDfinished);
//listObj.Add(model.FWDfinished);
listObj.Add(model.Systemreinstalled);
//listObj.Add(model.BlowingReport);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 9)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINALStatus = "Completed";
}
//如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 9)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINALStatus = "Not Start";
@@ -129,13 +130,13 @@ namespace FineUIPro.Web.Transfer
newModel.Subsystem = newModel.Subsystem;
newModel.TestPackage = txtTestPackage.Text;
newModel.PWD = ddlPWD.SelectedValue;
newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
newModel.NDTReport = ddlNDTReport.SelectedValue;
newModel.TemperaryMeasurement = ddlTemperaryMeasurement.SelectedValue;
//newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
//newModel.NDTReport = ddlNDTReport.SelectedValue;
//newModel.TemperaryMeasurement = ddlTemperaryMeasurement.SelectedValue;
newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
newModel.Report = ddlReport.SelectedValue;
newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
newModel.FWDfinished = ddlFWDfinished.SelectedValue;
//newModel.FWDfinished = ddlFWDfinished.SelectedValue;
newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
newModel.BlowingReport = txtBlowingReport.Text;
newModel.FINALStatus = model.FINALStatus;
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
Generated
-36
View File
@@ -95,42 +95,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlPWD;
/// <summary>
/// ddlApunchclosed 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlApunchclosed;
/// <summary>
/// ddlNDTReport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlNDTReport;
/// <summary>
/// ddlTemperaryMeasurement 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlTemperaryMeasurement;
/// <summary>
/// ddlFWDfinished 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlFWDfinished;
/// <summary>
/// ddlHydrostaticTest 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+4
View File
@@ -83,6 +83,10 @@
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Lubricatefilling" DataField="Lubricatefilling" FieldType="String" HeaderText="Lubricate filling" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Motorsoloruntest" DataField="Motorsoloruntest" FieldType="String" HeaderText="Motor solorun test" TextAlign="Center"
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+10 -9
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 8);
AddDatasetToSQL(ds.Tables[0], 9);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 8);
AddDatasetToSQL2(ds.Tables[0], 9);
}
catch (Exception ex)
{
@@ -305,7 +305,7 @@ namespace FineUIPro.Web.Transfer
if (pds != null && ir > 0)
{
List<Model.Transfer_RotatingEquipment> list = new List<Model.Transfer_RotatingEquipment>();
for (int i = 1; i < ir; i++)
for (int i = 0; i < ir; i++)
{
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
@@ -323,16 +323,17 @@ namespace FineUIPro.Web.Transfer
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Alignment = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][6 + 1].ToString().Trim();
var obj4=model.Lubricatefilling= pds.Rows[i][6].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][7].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][8].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Completed";
list.Add(model);
@@ -341,7 +342,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Not Start";
list.Add(model);
@@ -361,7 +362,7 @@ namespace FineUIPro.Web.Transfer
#endregion
model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.MechanicalFINALStatus.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
+7
View File
@@ -57,6 +57,13 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlLubricatefilling" runat="server" Label="Lubricate filling" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlMotorsoloruntest" runat="server" Label="Motor solorun test" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
+7 -4
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.Transfer
ddlAlignment.SelectedValue = model.Alignment;
ddlMotorsoloruntest.SelectedValue = model.Motorsoloruntest;
ddlStandalonetest.SelectedValue = model.Standalonetest;
ddlLubricatefilling.SelectedValue = model.Lubricatefilling;
txtDescriptions.Text = model.Descriptions;
}
}
@@ -75,7 +76,8 @@ namespace FineUIPro.Web.Transfer
Alignment = ddlAlignment.SelectedValue,
Motorsoloruntest = ddlMotorsoloruntest.SelectedValue,
Standalonetest = ddlStandalonetest.SelectedValue,
Descriptions= txtDescriptions.Text
Descriptions= txtDescriptions.Text,
Lubricatefilling=ddlLubricatefilling.SelectedValue
};
#region 判断状态
@@ -83,13 +85,13 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Alignment);
listObj.Add(model.Motorsoloruntest);
listObj.Add(model.Standalonetest);
listObj.Add(model.Lubricatefilling);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Not Start";
}
@@ -115,6 +117,7 @@ namespace FineUIPro.Web.Transfer
newModel.Standalonetest = ddlStandalonetest.SelectedValue;
newModel.MechanicalFINALStatus = model.MechanicalFINALStatus;
newModel.Descriptions = txtDescriptions.Text;
newModel.Lubricatefilling = ddlLubricatefilling.SelectedValue;
}
}
else
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs
Generated
+9
View File
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlAlignment;
/// <summary>
/// ddlLubricatefilling 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlLubricatefilling;
/// <summary>
/// ddlMotorsoloruntest 控件。
/// </summary>
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+2 -1
View File
@@ -119,7 +119,8 @@
<TreeNode id="A5D0287B-2410-4DB1-8BD4-E0534EBAE308" Text="应急流程" NavigateUrl="HSSE/Emergency/EmergencyProcess.aspx"></TreeNode>
<TreeNode id="CF5516F7-0735-44EF-9A6D-46FABF8EBC6E" Text="应急演练开展情况" NavigateUrl="HSSE/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="03235B30-960D-4FCF-99F7-97773A2EE108" Text="工作报告" NavigateUrl=""><TreeNode id="68A52EEA-2661-4CB0-9382-A36AA5DCC480" Text="HSE管理月报" NavigateUrl="HSSE/Manager/ManagerMonthC.aspx"></TreeNode>
<TreeNode id="03235B30-960D-4FCF-99F7-97773A2EE108" Text="工作报告" NavigateUrl=""><TreeNode id="9E4B28DF-8C8E-49F8-AB15-270BBDC73449" Text="HSE管理月报(新)" NavigateUrl="HSSE/Manager/ManagerMonthCNew.aspx"></TreeNode>
<TreeNode id="68A52EEA-2661-4CB0-9382-A36AA5DCC480" Text="HSE管理月报" NavigateUrl="HSSE/Manager/ManagerMonthC.aspx"></TreeNode>
<TreeNode id="D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82" Text="月报" NavigateUrl="HSSE/Manager/ManagerMonth_SeDin.aspx"></TreeNode>
<TreeNode id="88AE0EF8-D29E-409F-A154-CCA3999B00AE" Text="HSE完工报告" NavigateUrl="HSSE/Manager/CompletionReport.aspx"></TreeNode>
<TreeNode id="8E5B4A8E-B06E-4C8A-A2C8-1091A9BCAF72" Text="工程师HSE日志" NavigateUrl="HSSE/Manager/HSEDiary.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+2 -2
View File
@@ -392,9 +392,9 @@ namespace FineUIPro.Web
var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var TotalCheckDetailOKLists = from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
//join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
where y.ProjectId == this.CurrUser.LoginProjectId
select new { z.UnitWorkId, y.IsOnceQualified };
select new { x.UnitWorkId, y.IsOnceQualified };
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
SGGL/FineUIPro.Web/index.aspx
+9 -1
View File
@@ -718,7 +718,8 @@
});
$(".n-btn-l,.n-btn-r").click(function () {
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
$('.n-btn-r').each(function (index) {
console.log($(this))
@@ -733,6 +734,13 @@
});
$(".bgbtn_head").click(function () {
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:none !important;")
})
var mainTabStrip = F(mainTabStripClientID);
var leftPanel = F(leftPanelClientID);
var mainMenu = leftPanel.items[0];