diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei) 修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei) 修改明细.txt new file mode 100644 index 00000000..ca805bcf --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei) 修改明细.txt @@ -0,0 +1,6 @@ +--ADD BY lipengfei 2022-09-08 +1,合同基本信息字段添加 +2,焊接一次合格率查询修改 +3,焊接缺陷分析查询修改 +4，合同mobile针对人员修改 +--END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei).sql b/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei).sql new file mode 100644 index 00000000..5a0c5523 Binary files /dev/null and b/DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei).sql differ diff --git a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs index 543a274f..38809482 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs @@ -71,44 +71,60 @@ namespace BLL /// 增加合同基本信息 /// /// - public static void AddContract(Model.PHTGL_Contract contract) + public static void AddContract(Model.PHTGL_Contract newtable) { - Model.PHTGL_Contract newContract = new Model.PHTGL_Contract(); - newContract.ContractId = contract.ContractId; - newContract.ContractCode = contract.ContractCode; - newContract.ProjectId = contract.ProjectId; - newContract.ContractName = contract.ContractName; - newContract.ContractNum = contract.ContractNum; - newContract.Parties = contract.Parties; - newContract.Currency = contract.Currency; - newContract.ContractAmount = contract.ContractAmount; - newContract.DepartId = contract.DepartId; - newContract.Agent = contract.Agent; - newContract.ContractType = contract.ContractType; - newContract.Remarks = contract.Remarks; - newContract.ApproveState = contract.ApproveState; - newContract.CreatUser = contract.CreatUser; - newContract.IsPassBid = contract.IsPassBid; - newContract.PassBidCode = contract.PassBidCode; - newContract.BuildUnit = contract.BuildUnit; - newContract.EPCCode = contract.EPCCode; - newContract.IsUseStandardtxt = contract.IsUseStandardtxt; - newContract.NoUseStandardtxtRemark = contract.NoUseStandardtxtRemark; - newContract.ProjectShortName = contract.ProjectShortName; - newContract.ContractAttribute = contract.ContractAttribute; - newContract.ContractAttributeRemark = contract.ContractAttributeRemark; - newContract.ConfirmWay = contract.ConfirmWay; - newContract.SetSubReviewCode = contract.SetSubReviewCode; - newContract.ActionPlanCode = contract.ActionPlanCode; - newContract.SituationRemark = contract.SituationRemark; - newContract.OpeningBank_TT = contract.OpeningBank_TT; - newContract.OpeningBank_Electrophore = contract.OpeningBank_Electrophore; - newContract.BankAccount_TT = contract.BankAccount_TT; - newContract.BankAccount_Electrophore = contract.BankAccount_Electrophore; - newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore; - newContract.Retentionmoney = contract.Retentionmoney; - newContract.CreateDate = contract.CreateDate; - Funs.DB.PHTGL_Contract.InsertOnSubmit(newContract); + Model.PHTGL_Contract table = new Model.PHTGL_Contract + { + ContractId = newtable.ContractId, + ProjectId = newtable.ProjectId, + ContractName = newtable.ContractName, + ContractNum = newtable.ContractNum, + Parties = newtable.Parties, + Currency = newtable.Currency, + ContractAmount = newtable.ContractAmount, + DepartId = newtable.DepartId, + Agent = newtable.Agent, + ContractType = newtable.ContractType, + Remarks = newtable.Remarks, + ApproveState = newtable.ApproveState, + CreatUser = newtable.CreatUser, + ContractCode = newtable.ContractCode, + IsPassBid = newtable.IsPassBid, + PassBidCode = newtable.PassBidCode, + BuildUnit = newtable.BuildUnit, + IsUseStandardtxt = newtable.IsUseStandardtxt, + NoUseStandardtxtRemark = newtable.NoUseStandardtxtRemark, + EPCCode = newtable.EPCCode, + ProjectShortName = newtable.ProjectShortName, + ContractAttribute = newtable.ContractAttribute, + ContractAttributeRemark = newtable.ContractAttributeRemark, + ConfirmWay = newtable.ConfirmWay, + SetSubReviewCode = newtable.SetSubReviewCode, + ActionPlanCode = newtable.ActionPlanCode, + SituationRemark = newtable.SituationRemark, + OpeningBank_TT = newtable.OpeningBank_TT, + OpeningBank_Electrophore = newtable.OpeningBank_Electrophore, + BankAccount_TT = newtable.BankAccount_TT, + BankAccount_Electrophore = newtable.BankAccount_Electrophore, + LineNumber_Electrophore = newtable.LineNumber_Electrophore, + Retentionmoney = newtable.Retentionmoney, + CreateDate = newtable.CreateDate, + Status = newtable.Status, + ContactPersonOfPartyA = newtable.ContactPersonOfPartyA, + ContactPersonOfPartyB = newtable.ContactPersonOfPartyB, + ContactPersonPhoneOfPartyB = newtable.ContactPersonPhoneOfPartyB, + ContactPersonEmailOfPartyB = newtable.ContactPersonEmailOfPartyB, + ContractAmountExcludingTax = newtable.ContractAmountExcludingTax, + PriceMethod = newtable.PriceMethod, + SignedOnDate = newtable.SignedOnDate, + ContractStartDate = newtable.ContractStartDate, + ContractEndDate = newtable.ContractEndDate, + PricingBasis = newtable.PricingBasis, + SubcontractingMethod = newtable.SubcontractingMethod, + IsItACentralizedPurchaseSupplier = newtable.IsItACentralizedPurchaseSupplier, + ContactUnitOfPartyA = newtable.ContactUnitOfPartyA, + }; + Funs.DB.PHTGL_Contract.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } @@ -155,7 +171,20 @@ namespace BLL newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore; newContract.Retentionmoney = contract.Retentionmoney; newContract.CreateDate = contract.CreateDate; - + newContract.Status = contract.Status; + newContract.ContactPersonOfPartyA = contract.ContactPersonOfPartyA; + newContract.ContactPersonOfPartyB = contract.ContactPersonOfPartyB; + newContract.ContactPersonPhoneOfPartyB = contract.ContactPersonPhoneOfPartyB; + newContract.ContactPersonEmailOfPartyB = contract.ContactPersonEmailOfPartyB; + newContract.ContractAmountExcludingTax = contract.ContractAmountExcludingTax; + newContract.PriceMethod = contract.PriceMethod; + newContract.SignedOnDate = contract.SignedOnDate; + newContract.ContractStartDate = contract.ContractStartDate; + newContract.ContractEndDate = contract.ContractEndDate; + newContract.PricingBasis = contract.PricingBasis; + newContract.SubcontractingMethod = contract.SubcontractingMethod; + newContract.IsItACentralizedPurchaseSupplier = contract.IsItACentralizedPurchaseSupplier; + newContract.ContactUnitOfPartyA = contract.ContactUnitOfPartyA; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs index ad0b371b..399886d1 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs @@ -59,16 +59,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["ApproveManModels"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -86,23 +86,23 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ApproveManModels = PHTGL_ActionPlanReviewService.GetApproveManModels(_ActionPlanFormation.ProjectID, ActionPlanReviewId); EndApproveType = ApproveManModels.Count; //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, PersonId); this.txtProjectCode.Text = _ActionPlanFormation.EPCCode; this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_ActionPlanFormation.CreatUser); - if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, UserId)) + if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_ActionPlanFormation.CreatUser == UserId) + else if (_ActionPlanFormation.CreatUser == PersonId) { BindGrid(); } @@ -125,7 +125,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -133,7 +133,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", ActionPlanReviewId)); diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs index a46be16d..d5dd106d 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs @@ -60,16 +60,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -86,24 +86,24 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement EndApproveType = ApproveManModels.Count; //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, PersonId); //文本框赋值 txtBidProject.Text = _Bid.BidProject; txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID).ProjectShortName; txtBidDocumentsCode.Text = BidDoc.BidDocumentsCode; ; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser); - if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, UserId)) + if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_Bid.CreateUser == UserId) + else if (_Bid.CreateUser == PersonId) { BindGrid(); } @@ -119,7 +119,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -127,7 +127,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", ApproveUserReviewID)); @@ -148,7 +148,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ,APP.ApproveUserUnit ,APP.Remarks" + @" FROM PHTGL_BidApproveUserReview_Sch1 AS APP " - + @" LEFT JOIN Sys_User AS U ON U.UserId =APP.ApproveUserName " + + @" LEFT JOIN SitePerson_Person AS U ON U.PersonId =APP.ApproveUserName " + @"where 1=1 AND ApproveUserReviewID = @ApproveUserReviewID "; List listStr = new List(); if (string.IsNullOrEmpty(ApproveUserReviewID)) diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs index 25ddd15b..9d0dde03 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs @@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -106,22 +106,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ApproveManModels = PHTGL_BidDocumentsReviewService.GetApproveManModels(_Bid.ProjectId, _Bid.BidDocumentsReviewId); //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, PersonId); this.txtProjectCode.Text = _ActionPlanFormation.EPCCode; this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser); - if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, UserId)) + if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_Bid.CreateUser == UserId) + else if (_Bid.CreateUser == PersonId) { BindGrid(); } @@ -146,7 +146,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -154,7 +154,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", BidDocumentsReviewId)); diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs index 70b64c53..eff2ce8a 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs @@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -97,22 +97,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Dic_ApproveMan = PHTGL_SetSubReviewService.Get_DicApproveman(SetSubReviewID); ApproveManModels = PHTGL_SetSubReviewService.GetApproveManModels(SetSubReviewID); //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, PersonId); //数据加载 Bind(); var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID); - if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, UserId)) + if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_SetSubReview.CreateUser == UserId) + else if (_SetSubReview.CreateUser == PersonId) { BindGrid(); } @@ -236,7 +236,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -244,7 +244,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", SetSubReviewID)); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..34b8e588 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,114 @@ + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 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.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 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/08/2022 19:56:26 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:56:26 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 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.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 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/08/2022 19:57:31 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:57:31 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 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.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 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/08/2022 19:57:53 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:57:53 + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx index 008e1829..84f2a1da 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx @@ -18,12 +18,57 @@ SortField="UnitWorkCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs index 89b83780..d8821b86 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs @@ -15,13 +15,110 @@ namespace FineUIPro.Web.HJGL.WeldingReport if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + Funs.FineUIPleaseSelect(drpJointAttribute); + + BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + } } private void BindGrid() { List listStr = new List(); + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + if (this.drpUnitId.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + if (drpUnitWorkId.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@UnitWork", null)); + + } + + if (!string.IsNullOrEmpty(this.txtMaterialCode.Text)) + { + listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@MaterialCode", null)); + + } + if (!string.IsNullOrEmpty(this.txtSingleName.Text)) + { + listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@SingleName ", null)); + + } + if (!string.IsNullOrEmpty(this.txtThickness.Text)) + { + listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Thickness", null)); + + } + if (!string.IsNullOrEmpty(this.txtSpecification.Text)) + { + listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Specification", null)); + + } + if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text)) + { + listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@WeldTypeCode", null)); + + } + if (drpJointAttribute.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@JointAttribute", null)); + + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text)) + { + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@PersonName", null)); + + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_CheckDefects", parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs index 014b4759..c49078f8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingReport { - - - public partial class DefectStatistics { - +namespace FineUIPro.Web.HJGL.WeldingReport +{ + + + public partial class DefectStatistics + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,106 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// drpUnitWorkId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkId; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtMaterialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode; + + /// + /// txtSingleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSingleName; + + /// + /// txtThickness 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtThickness; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtWeldTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldTypeCode; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + /// /// ToolbarFill1 控件。 /// @@ -65,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// BtnAnalyse 控件。 /// @@ -74,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// btnOut 控件。 /// @@ -83,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// ToolbarSeparator1 控件。 /// @@ -92,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -101,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx index 2fcb3fa2..daf047d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx @@ -23,22 +23,65 @@ + LabelAlign="Right" Width="240px" LabelWidth="80px" > + + + LabelAlign="Right" Width="240px" LabelWidth="80px"> + Width="180px" LabelWidth="80px"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs index 48c370c7..e4c29480 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs @@ -15,7 +15,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + Funs.FineUIPleaseSelect(drpJointAttribute); + BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(drpDetectionType, true, string.Empty); @@ -64,6 +70,85 @@ namespace FineUIPro.Web.HJGL.WeldingReport { listStr.Add(new SqlParameter("@date2", null)); } + if (drpUnitWorkId.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@UnitWork", null)); + + } + + if (!string.IsNullOrEmpty(this.txtMaterialCode.Text)) + { + listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@MaterialCode", null)); + + } + if (!string.IsNullOrEmpty(this.txtSingleName.Text)) + { + listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@SingleName ", null)); + + } + if (!string.IsNullOrEmpty(this.txtThickness.Text)) + { + listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Thickness", null)); + + } + if (!string.IsNullOrEmpty(this.txtSpecification.Text)) + { + listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Specification", null)); + + } + if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text)) + { + listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@WeldTypeCode", null)); + + } + if (drpJointAttribute.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@JointAttribute", null)); + + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text)) + { + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@PersonName", null)); + + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderFirstPassRate", parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs index 6e5554f1..b7aaf51b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingReport { - - - public partial class FirstPassRate { - +namespace FineUIPro.Web.HJGL.WeldingReport +{ + + + public partial class FirstPassRate + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpUnitId 控件。 /// @@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + + /// + /// drpUnitWorkId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkId; + /// /// drpDetectionType 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpDetectionType; - + /// /// txtStarTime 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -101,7 +112,88 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtMaterialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode; + + /// + /// txtSingleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSingleName; + + /// + /// txtThickness 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtThickness; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtWeldTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldTypeCode; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + /// /// ToolbarFill1 控件。 /// @@ -110,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// BtnAnalyse 控件。 /// @@ -119,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// btnOut 控件。 /// @@ -128,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// ToolbarSeparator1 控件。 /// @@ -137,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx index e18c4a63..a50e943a 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx @@ -25,21 +25,21 @@
- - + - + - - @@ -50,10 +50,26 @@ - + - - + + + + + + + + + + + + + + + + + + @@ -68,8 +84,11 @@ - - + + + + + @@ -82,85 +101,126 @@ - + - - + + - - + + + - - + + - - + + - + - - - + + + + + + + + + + + + + + + + + + + - + - - + + - - + + + + + + - - + + + + + + + + + + - - + + - + + - + + + + + + + + + + + + - - + - + - <%-- + <%-- @@ -169,8 +229,8 @@ - - + @@ -279,7 +339,7 @@ - + @@ -1379,7 +1439,7 @@ + Width="120px" LabelAlign="right"> @@ -1410,7 +1470,7 @@ + Width="120px" LabelAlign="right"> @@ -1625,7 +1685,7 @@ + Width="120px" LabelAlign="left"> @@ -1646,9 +1706,9 @@ - - + @@ -1704,7 +1764,7 @@ + Width="120px" LabelAlign="right"> @@ -2193,7 +2253,7 @@ - @@ -2213,7 +2273,7 @@ - + @@ -2225,13 +2285,13 @@ - + - + @@ -2343,7 +2403,7 @@ + Width="120px" LabelAlign="left"> @@ -2379,7 +2439,7 @@ + Width="120px" LabelAlign="left"> @@ -2491,8 +2551,8 @@ - - + + @@ -2524,7 +2584,7 @@ + Width="120px" LabelAlign="right"> @@ -2558,7 +2618,7 @@ - @@ -2567,7 +2627,7 @@ - @@ -2616,7 +2676,7 @@ - + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs index 8bdc07a9..ce64dcb1 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs @@ -205,6 +205,31 @@ namespace FineUIPro.Web.PHTGL.ContractCompile txtBankAccount_Electrophore.Text = contract.BankAccount_Electrophore; txtLineNumber_Electrophore.Text = contract.LineNumber_Electrophore; txtRetentionmoney.Text = contract.Retentionmoney; + txtContactUnitOfPartyA.Text = contract.ContactUnitOfPartyA; + txtContactPersonOfPartyA.Text = contract.ContactPersonOfPartyA; + txtContactPersonOfPartyB.Text = contract.ContactPersonOfPartyB; + txtContactPersonPhoneOfPartyB.Text = contract.ContactPersonPhoneOfPartyB; + txtContactPersonEmailOfPartyB.Text = contract.ContactPersonEmailOfPartyB; + txtContractAmountExcludingTax.Text = contract.ContractAmountExcludingTax.ToString(); + txtPriceMethod.Text = contract.PriceMethod; + txtSignedOnDate.SelectedDate = contract.SignedOnDate; + txtContractStartDate.SelectedDate = contract.ContractStartDate; + txtContractEndDate.SelectedDate = contract.ContractEndDate; + txtPricingBasis.Text = contract.PricingBasis; + + if (contract.Status != null) + { + DropStatus.SelectedValue = contract.Status.ToString(); + + } + if (!string.IsNullOrEmpty(contract.SubcontractingMethod)) + { + dropSubcontractingMethod.SelectedValue = contract.SubcontractingMethod; + } + if (contract.IsItACentralizedPurchaseSupplier != null) + { + dropIsItACentralizedPurchaseSupplier.SelectedValue = contract.IsItACentralizedPurchaseSupplier.ToString(); + } if (!string.IsNullOrEmpty(contract.Currency)) { this.drpCurrency.SelectedValue = contract.Currency; @@ -480,6 +505,21 @@ namespace FineUIPro.Web.PHTGL.ContractCompile newContract.BankAccount_Electrophore = this.txtBankAccount_Electrophore.Text; newContract.LineNumber_Electrophore = this.txtLineNumber_Electrophore.Text; newContract.Retentionmoney = this.txtRetentionmoney.Text; + newContract.ContactUnitOfPartyA = txtContactUnitOfPartyA.Text; + newContract.ContactPersonOfPartyA = txtContactPersonOfPartyA.Text; + newContract.ContactPersonOfPartyB = txtContactPersonOfPartyB.Text; + newContract.ContactPersonPhoneOfPartyB = txtContactPersonPhoneOfPartyB.Text; + newContract.ContactPersonEmailOfPartyB = txtContactPersonEmailOfPartyB.Text; + newContract.ContractAmountExcludingTax = Funs.GetNewDecimal(txtContractAmountExcludingTax.Text.Trim()); + newContract.PriceMethod = txtPriceMethod.Text; + newContract.SignedOnDate = txtSignedOnDate.SelectedDate; + newContract.ContractStartDate = txtContractStartDate.SelectedDate; + newContract.ContractEndDate = txtContractEndDate.SelectedDate; + newContract.PricingBasis = txtPricingBasis.Text; + newContract.Status = Funs.GetNewInt(DropStatus.SelectedValue); + newContract.SubcontractingMethod = dropSubcontractingMethod.SelectedValue; + newContract.IsItACentralizedPurchaseSupplier = Funs.GetNewInt(dropIsItACentralizedPurchaseSupplier.SelectedValue); + if (this.drpCurrency.SelectedValue != BLL.Const._Null) { newContract.Currency = this.drpCurrency.SelectedValue; diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs index 3fd0bcf4..a5123c94 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs @@ -113,6 +113,42 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList DropContractAttribute; + /// + /// DropStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropStatus; + + /// + /// txtSignedOnDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtSignedOnDate; + + /// + /// txtContractStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtContractStartDate; + + /// + /// txtContractEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtContractEndDate; + /// /// DropConfirmWay 控件。 /// @@ -122,6 +158,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList DropConfirmWay; + /// + /// dropSubcontractingMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList dropSubcontractingMethod; + /// /// IsUseStandardtxt 控件。 /// @@ -195,13 +240,40 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected global::FineUIPro.TextBox tab1_txtContractNum; /// - /// tab1_txtParties 控件。 + /// drpContractType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox tab1_txtParties; + protected global::FineUIPro.DropDownList drpContractType; + + /// + /// tab1_BuildUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox tab1_BuildUnit; + + /// + /// txtPriceMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPriceMethod; + + /// + /// txtPricingBasis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPricingBasis; /// /// drpCurrency 控件。 @@ -221,6 +293,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.NumberBox tab1_txtContractAmount; + /// + /// txtContractAmountExcludingTax 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtContractAmountExcludingTax; + /// /// drpDepartId 控件。 /// @@ -240,22 +321,67 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected global::FineUIPro.DropDownList drpAgent; /// - /// drpContractType 控件。 + /// txtContactUnitOfPartyA 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpContractType; + protected global::FineUIPro.TextBox txtContactUnitOfPartyA; /// - /// tab1_BuildUnit 控件。 + /// txtContactPersonOfPartyA 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox tab1_BuildUnit; + protected global::FineUIPro.TextBox txtContactPersonOfPartyA; + + /// + /// tab1_txtParties 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox tab1_txtParties; + + /// + /// dropIsItACentralizedPurchaseSupplier 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList dropIsItACentralizedPurchaseSupplier; + + /// + /// txtContactPersonOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonOfPartyB; + + /// + /// txtContactPersonPhoneOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonPhoneOfPartyB; + + /// + /// txtContactPersonEmailOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonEmailOfPartyB; /// /// txtOpeningBank_TT 控件。 diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx index a5f7159b..5bf74bca 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx @@ -95,7 +95,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs index a7f76e14..8f251fb3 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs @@ -72,6 +72,23 @@ namespace FineUIPro.Web.PHTGL.ContractCompile Con.EPCCode, con.ProjectShortName, (convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName, + (CASE Con.Status WHEN '0' THEN '已签订' + WHEN '1' THEN '已完毕' END) as Status, + Con.ContactUnitOfPartyA, + Con.ContactPersonOfPartyA, + Con.ContactPersonOfPartyB, + Con.ContactPersonPhoneOfPartyB, + Con.ContactPersonEmailOfPartyB, + Con.ContractAmountExcludingTax, + Con.PriceMethod, + CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate, + CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate, + CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate, + Con.PricingBasis, + (CASE Con.SubcontractingMethod WHEN '1' then '内部分包' + WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, + (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否' + WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier, Sub.Bank1, Sub.SubcontractPriceForm, Sub.Account1" diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx index badb84f1..5a52327c 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx @@ -94,6 +94,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,6 +172,6 @@ + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs index 37667e72..8a4790f9 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs @@ -46,11 +46,11 @@ namespace FineUIPro.Web.PHTGL.Filing WHEN '5' THEN 'ds' END) AS ContractType, ( CASE Rev.State WHEN @ContractCreating THEN '编制中' - WHEN @Contract_countersign THEN '会签中' + WHEN @Contract_countersign THEN '会签中' WHEN @ContractReviewing THEN '审批中' WHEN @ContractReview_Complete THEN '审批成功' WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State , - Con.Remarks, + Con.Remarks, Con.EPCCode, Con.ProjectShortName, Con.[OpeningBank-TT] as OpeningBank_TT , @@ -58,11 +58,28 @@ namespace FineUIPro.Web.PHTGL.Filing Con.[BankAccount-TT] as BankAccount_TT, Con.[BankAccount-electrophore] as BankAccount_electrophore, Con.[LineNumber-electrophore] as LineNumber_electrophore, - Con.Retentionmoney, + Con.Retentionmoney, + (CASE Con.Status WHEN '0' THEN '已签订' + WHEN '1' THEN '已完毕' END) as Status, + Con.ContactUnitOfPartyA, + Con.ContactPersonOfPartyA, + Con.ContactPersonOfPartyB, + Con.ContactPersonPhoneOfPartyB, + Con.ContactPersonEmailOfPartyB, + Con.ContractAmountExcludingTax, + Con.PriceMethod, + CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate, + CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate, + CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate, + Con.PricingBasis, + (CASE Con.SubcontractingMethod WHEN '1' then '内部分包' + WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, + (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否' + WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier, Pro.ProjectCode, Pro.ProjectName, Dep.DepartName, - U.PersonName AS AgentName" + U.PersonName AS AgentName " + @" from PHTGL_ContractReview AS Rev" + @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId" //+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode" diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2aa5c7c0..7c45480d 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -344,6 +344,12 @@ namespace Model partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); + partial void InsertConManager_LongList(ConManager_LongList instance); + partial void UpdateConManager_LongList(ConManager_LongList instance); + partial void DeleteConManager_LongList(ConManager_LongList instance); + partial void InsertConManager_SubAchievement(ConManager_SubAchievement instance); + partial void UpdateConManager_SubAchievement(ConManager_SubAchievement instance); + partial void DeleteConManager_SubAchievement(ConManager_SubAchievement instance); partial void InsertCostGoods_CostManage(CostGoods_CostManage instance); partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance); partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance); @@ -749,6 +755,9 @@ namespace Model partial void InsertPerson_Persons(Person_Persons instance); partial void UpdatePerson_Persons(Person_Persons instance); partial void DeletePerson_Persons(Person_Persons instance); + partial void InsertPerson_PersonsCertificate(Person_PersonsCertificate instance); + partial void UpdatePerson_PersonsCertificate(Person_PersonsCertificate instance); + partial void DeletePerson_PersonsCertificate(Person_PersonsCertificate instance); partial void InsertPerson_PersonTrain(Person_PersonTrain instance); partial void UpdatePerson_PersonTrain(Person_PersonTrain instance); partial void DeletePerson_PersonTrain(Person_PersonTrain instance); @@ -2275,6 +2284,22 @@ namespace Model } } + public System.Data.Linq.Table ConManager_LongList + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table ConManager_SubAchievement + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table CostGoods_CostManage { get @@ -3363,6 +3388,14 @@ namespace Model } } + public System.Data.Linq.Table Person_PersonsCertificate + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Person_PersonTrain { get @@ -49855,6 +49888,802 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_LongList")] + public partial class ConManager_LongList : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ConManagerLongListId; + + private System.Nullable _State; + + private string _SubUnitName; + + private string _SubUnitNature; + + private string _Corporate; + + private string _Address; + + private string _CollCropCode; + + private string _RegisteredCapital; + + private string _SubjectNatureLevel; + + private string _OtherNatureLevel; + + private string _MainBusiness; + + private string _OpeningBank_TT; + + private string _BankAccount_TT; + + private string _OpeningBank_electrophore; + + private string _BankAccount_electrophore; + + private string _LineNumber_electrophore; + + private string _LinkUserName; + + private string _LinkUserPosition; + + private string _LinkUserMobile; + + private string _LinkUserEMail; + + private string _Personal_all; + + private string _Personal_Skilled; + + private string _Personal_Manager; + + private string _Personal_Reg; + + private string _AchievementId; + + private string _IsQualifiedSub; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnConManagerLongListIdChanging(string value); + partial void OnConManagerLongListIdChanged(); + partial void OnStateChanging(System.Nullable value); + partial void OnStateChanged(); + partial void OnSubUnitNameChanging(string value); + partial void OnSubUnitNameChanged(); + partial void OnSubUnitNatureChanging(string value); + partial void OnSubUnitNatureChanged(); + partial void OnCorporateChanging(string value); + partial void OnCorporateChanged(); + partial void OnAddressChanging(string value); + partial void OnAddressChanged(); + partial void OnCollCropCodeChanging(string value); + partial void OnCollCropCodeChanged(); + partial void OnRegisteredCapitalChanging(string value); + partial void OnRegisteredCapitalChanged(); + partial void OnSubjectNatureLevelChanging(string value); + partial void OnSubjectNatureLevelChanged(); + partial void OnOtherNatureLevelChanging(string value); + partial void OnOtherNatureLevelChanged(); + partial void OnMainBusinessChanging(string value); + partial void OnMainBusinessChanged(); + partial void OnOpeningBank_TTChanging(string value); + partial void OnOpeningBank_TTChanged(); + partial void OnBankAccount_TTChanging(string value); + partial void OnBankAccount_TTChanged(); + partial void OnOpeningBank_electrophoreChanging(string value); + partial void OnOpeningBank_electrophoreChanged(); + partial void OnBankAccount_electrophoreChanging(string value); + partial void OnBankAccount_electrophoreChanged(); + partial void OnLineNumber_electrophoreChanging(string value); + partial void OnLineNumber_electrophoreChanged(); + partial void OnLinkUserNameChanging(string value); + partial void OnLinkUserNameChanged(); + partial void OnLinkUserPositionChanging(string value); + partial void OnLinkUserPositionChanged(); + partial void OnLinkUserMobileChanging(string value); + partial void OnLinkUserMobileChanged(); + partial void OnLinkUserEMailChanging(string value); + partial void OnLinkUserEMailChanged(); + partial void OnPersonal_allChanging(string value); + partial void OnPersonal_allChanged(); + partial void OnPersonal_SkilledChanging(string value); + partial void OnPersonal_SkilledChanged(); + partial void OnPersonal_ManagerChanging(string value); + partial void OnPersonal_ManagerChanged(); + partial void OnPersonal_RegChanging(string value); + partial void OnPersonal_RegChanged(); + partial void OnAchievementIdChanging(string value); + partial void OnAchievementIdChanged(); + partial void OnIsQualifiedSubChanging(string value); + partial void OnIsQualifiedSubChanged(); + #endregion + + public ConManager_LongList() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConManagerLongListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ConManagerLongListId + { + get + { + return this._ConManagerLongListId; + } + set + { + if ((this._ConManagerLongListId != value)) + { + this.OnConManagerLongListIdChanging(value); + this.SendPropertyChanging(); + this._ConManagerLongListId = value; + this.SendPropertyChanged("ConManagerLongListId"); + this.OnConManagerLongListIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] + public System.Nullable State + { + get + { + return this._State; + } + set + { + if ((this._State != value)) + { + this.OnStateChanging(value); + this.SendPropertyChanging(); + this._State = value; + this.SendPropertyChanged("State"); + this.OnStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="NVarChar(200)")] + public string SubUnitName + { + get + { + return this._SubUnitName; + } + set + { + if ((this._SubUnitName != value)) + { + this.OnSubUnitNameChanging(value); + this.SendPropertyChanging(); + this._SubUnitName = value; + this.SendPropertyChanged("SubUnitName"); + this.OnSubUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitNature", DbType="NVarChar(200)")] + public string SubUnitNature + { + get + { + return this._SubUnitNature; + } + set + { + if ((this._SubUnitNature != value)) + { + this.OnSubUnitNatureChanging(value); + this.SendPropertyChanging(); + this._SubUnitNature = value; + this.SendPropertyChanged("SubUnitNature"); + this.OnSubUnitNatureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Corporate", DbType="NVarChar(200)")] + public string Corporate + { + get + { + return this._Corporate; + } + set + { + if ((this._Corporate != value)) + { + this.OnCorporateChanging(value); + this.SendPropertyChanging(); + this._Corporate = value; + this.SendPropertyChanged("Corporate"); + this.OnCorporateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] + public string Address + { + get + { + return this._Address; + } + set + { + if ((this._Address != value)) + { + this.OnAddressChanging(value); + this.SendPropertyChanging(); + this._Address = value; + this.SendPropertyChanged("Address"); + this.OnAddressChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="NVarChar(200)")] + public string CollCropCode + { + get + { + return this._CollCropCode; + } + set + { + if ((this._CollCropCode != value)) + { + this.OnCollCropCodeChanging(value); + this.SendPropertyChanging(); + this._CollCropCode = value; + this.SendPropertyChanged("CollCropCode"); + this.OnCollCropCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisteredCapital", DbType="NVarChar(50)")] + public string RegisteredCapital + { + get + { + return this._RegisteredCapital; + } + set + { + if ((this._RegisteredCapital != value)) + { + this.OnRegisteredCapitalChanging(value); + this.SendPropertyChanging(); + this._RegisteredCapital = value; + this.SendPropertyChanged("RegisteredCapital"); + this.OnRegisteredCapitalChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubjectNatureLevel", DbType="NVarChar(200)")] + public string SubjectNatureLevel + { + get + { + return this._SubjectNatureLevel; + } + set + { + if ((this._SubjectNatureLevel != value)) + { + this.OnSubjectNatureLevelChanging(value); + this.SendPropertyChanging(); + this._SubjectNatureLevel = value; + this.SendPropertyChanged("SubjectNatureLevel"); + this.OnSubjectNatureLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherNatureLevel", DbType="NVarChar(200)")] + public string OtherNatureLevel + { + get + { + return this._OtherNatureLevel; + } + set + { + if ((this._OtherNatureLevel != value)) + { + this.OnOtherNatureLevelChanging(value); + this.SendPropertyChanging(); + this._OtherNatureLevel = value; + this.SendPropertyChanged("OtherNatureLevel"); + this.OnOtherNatureLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainBusiness", DbType="NVarChar(1000)")] + public string MainBusiness + { + get + { + return this._MainBusiness; + } + set + { + if ((this._MainBusiness != value)) + { + this.OnMainBusinessChanging(value); + this.SendPropertyChanging(); + this._MainBusiness = value; + this.SendPropertyChanged("MainBusiness"); + this.OnMainBusinessChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_TT", DbType="NVarChar(100)")] + public string OpeningBank_TT + { + get + { + return this._OpeningBank_TT; + } + set + { + if ((this._OpeningBank_TT != value)) + { + this.OnOpeningBank_TTChanging(value); + this.SendPropertyChanging(); + this._OpeningBank_TT = value; + this.SendPropertyChanged("OpeningBank_TT"); + this.OnOpeningBank_TTChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_TT", DbType="NVarChar(100)")] + public string BankAccount_TT + { + get + { + return this._BankAccount_TT; + } + set + { + if ((this._BankAccount_TT != value)) + { + this.OnBankAccount_TTChanging(value); + this.SendPropertyChanging(); + this._BankAccount_TT = value; + this.SendPropertyChanged("BankAccount_TT"); + this.OnBankAccount_TTChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_electrophore", DbType="NVarChar(100)")] + public string OpeningBank_electrophore + { + get + { + return this._OpeningBank_electrophore; + } + set + { + if ((this._OpeningBank_electrophore != value)) + { + this.OnOpeningBank_electrophoreChanging(value); + this.SendPropertyChanging(); + this._OpeningBank_electrophore = value; + this.SendPropertyChanged("OpeningBank_electrophore"); + this.OnOpeningBank_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_electrophore", DbType="NVarChar(100)")] + public string BankAccount_electrophore + { + get + { + return this._BankAccount_electrophore; + } + set + { + if ((this._BankAccount_electrophore != value)) + { + this.OnBankAccount_electrophoreChanging(value); + this.SendPropertyChanging(); + this._BankAccount_electrophore = value; + this.SendPropertyChanged("BankAccount_electrophore"); + this.OnBankAccount_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LineNumber_electrophore", DbType="NVarChar(100)")] + public string LineNumber_electrophore + { + get + { + return this._LineNumber_electrophore; + } + set + { + if ((this._LineNumber_electrophore != value)) + { + this.OnLineNumber_electrophoreChanging(value); + this.SendPropertyChanging(); + this._LineNumber_electrophore = value; + this.SendPropertyChanged("LineNumber_electrophore"); + this.OnLineNumber_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserName", DbType="NVarChar(50)")] + public string LinkUserName + { + get + { + return this._LinkUserName; + } + set + { + if ((this._LinkUserName != value)) + { + this.OnLinkUserNameChanging(value); + this.SendPropertyChanging(); + this._LinkUserName = value; + this.SendPropertyChanged("LinkUserName"); + this.OnLinkUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserPosition", DbType="NVarChar(100)")] + public string LinkUserPosition + { + get + { + return this._LinkUserPosition; + } + set + { + if ((this._LinkUserPosition != value)) + { + this.OnLinkUserPositionChanging(value); + this.SendPropertyChanging(); + this._LinkUserPosition = value; + this.SendPropertyChanged("LinkUserPosition"); + this.OnLinkUserPositionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserMobile", DbType="NVarChar(50)")] + public string LinkUserMobile + { + get + { + return this._LinkUserMobile; + } + set + { + if ((this._LinkUserMobile != value)) + { + this.OnLinkUserMobileChanging(value); + this.SendPropertyChanging(); + this._LinkUserMobile = value; + this.SendPropertyChanged("LinkUserMobile"); + this.OnLinkUserMobileChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserEMail", DbType="NVarChar(50)")] + public string LinkUserEMail + { + get + { + return this._LinkUserEMail; + } + set + { + if ((this._LinkUserEMail != value)) + { + this.OnLinkUserEMailChanging(value); + this.SendPropertyChanging(); + this._LinkUserEMail = value; + this.SendPropertyChanged("LinkUserEMail"); + this.OnLinkUserEMailChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_all", DbType="NVarChar(200)")] + public string Personal_all + { + get + { + return this._Personal_all; + } + set + { + if ((this._Personal_all != value)) + { + this.OnPersonal_allChanging(value); + this.SendPropertyChanging(); + this._Personal_all = value; + this.SendPropertyChanged("Personal_all"); + this.OnPersonal_allChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Skilled", DbType="NVarChar(200)")] + public string Personal_Skilled + { + get + { + return this._Personal_Skilled; + } + set + { + if ((this._Personal_Skilled != value)) + { + this.OnPersonal_SkilledChanging(value); + this.SendPropertyChanging(); + this._Personal_Skilled = value; + this.SendPropertyChanged("Personal_Skilled"); + this.OnPersonal_SkilledChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Manager", DbType="NVarChar(200)")] + public string Personal_Manager + { + get + { + return this._Personal_Manager; + } + set + { + if ((this._Personal_Manager != value)) + { + this.OnPersonal_ManagerChanging(value); + this.SendPropertyChanging(); + this._Personal_Manager = value; + this.SendPropertyChanged("Personal_Manager"); + this.OnPersonal_ManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Reg", DbType="NVarChar(200)")] + public string Personal_Reg + { + get + { + return this._Personal_Reg; + } + set + { + if ((this._Personal_Reg != value)) + { + this.OnPersonal_RegChanging(value); + this.SendPropertyChanging(); + this._Personal_Reg = value; + this.SendPropertyChanged("Personal_Reg"); + this.OnPersonal_RegChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50)")] + public string AchievementId + { + get + { + return this._AchievementId; + } + set + { + if ((this._AchievementId != value)) + { + this.OnAchievementIdChanging(value); + this.SendPropertyChanging(); + this._AchievementId = value; + this.SendPropertyChanged("AchievementId"); + this.OnAchievementIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualifiedSub", DbType="NVarChar(50)")] + public string IsQualifiedSub + { + get + { + return this._IsQualifiedSub; + } + set + { + if ((this._IsQualifiedSub != value)) + { + this.OnIsQualifiedSubChanging(value); + this.SendPropertyChanging(); + this._IsQualifiedSub = value; + this.SendPropertyChanged("IsQualifiedSub"); + this.OnIsQualifiedSubChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_SubAchievement")] + public partial class ConManager_SubAchievement : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _AchievementId; + + private string _ProjectName; + + private string _Remark; + + private string _HonorAward; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnAchievementIdChanging(string value); + partial void OnAchievementIdChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnHonorAwardChanging(string value); + partial void OnHonorAwardChanged(); + #endregion + + public ConManager_SubAchievement() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string AchievementId + { + get + { + return this._AchievementId; + } + set + { + if ((this._AchievementId != value)) + { + this.OnAchievementIdChanging(value); + this.SendPropertyChanging(); + this._AchievementId = value; + this.SendPropertyChanged("AchievementId"); + this.OnAchievementIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HonorAward", DbType="NVarChar(1000)")] + public string HonorAward + { + get + { + return this._HonorAward; + } + set + { + if ((this._HonorAward != value)) + { + this.OnHonorAwardChanging(value); + this.SendPropertyChanging(); + this._HonorAward = value; + this.SendPropertyChanged("HonorAward"); + this.OnHonorAwardChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")] public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -65917,8 +66746,6 @@ namespace Model private string _ImportType; - private string _DataClassification; - private string _FileName; private string _FilePath; @@ -65937,6 +66764,8 @@ namespace Model private string _CreateDate; + private string _DataClassification; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -65949,8 +66778,6 @@ namespace Model partial void OnUnitWorkIdChanged(); partial void OnImportTypeChanging(string value); partial void OnImportTypeChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); partial void OnFileNameChanging(string value); partial void OnFileNameChanged(); partial void OnFilePathChanging(string value); @@ -65969,6 +66796,8 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(string value); partial void OnCreateDateChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImport() @@ -66056,26 +66885,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="VarChar(500)")] public string FileName { @@ -66256,6 +67065,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -66289,10 +67118,10 @@ namespace Model private string _UnitWorkId; - private string _DataClassification; - private System.Nullable _Version; + private string _DataClassification; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -66303,10 +67132,10 @@ namespace Model partial void OnProjectIdChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); partial void OnVersionChanging(System.Nullable value); partial void OnVersionChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImportVerSionLog() @@ -66374,26 +67203,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] public System.Nullable Version { @@ -66414,6 +67223,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -73238,7 +74067,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -123911,6 +124740,284 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonsCertificate")] + public partial class Person_PersonsCertificate : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _PersonsCertificateId; + + private string _PersonId; + + private string _CertificateId; + + private string _CertificateCode; + + private string _SendUnit; + + private System.Nullable _SendDate; + + private System.Nullable _RegisterDate; + + private string _Major; + + private System.Nullable _ValidityDate; + + private string _Url; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnPersonsCertificateIdChanging(string value); + partial void OnPersonsCertificateIdChanged(); + partial void OnPersonIdChanging(string value); + partial void OnPersonIdChanged(); + partial void OnCertificateIdChanging(string value); + partial void OnCertificateIdChanged(); + partial void OnCertificateCodeChanging(string value); + partial void OnCertificateCodeChanged(); + partial void OnSendUnitChanging(string value); + partial void OnSendUnitChanged(); + partial void OnSendDateChanging(System.Nullable value); + partial void OnSendDateChanged(); + partial void OnRegisterDateChanging(System.Nullable value); + partial void OnRegisterDateChanged(); + partial void OnMajorChanging(string value); + partial void OnMajorChanged(); + partial void OnValidityDateChanging(System.Nullable value); + partial void OnValidityDateChanged(); + partial void OnUrlChanging(string value); + partial void OnUrlChanged(); + #endregion + + public Person_PersonsCertificate() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonsCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string PersonsCertificateId + { + get + { + return this._PersonsCertificateId; + } + set + { + if ((this._PersonsCertificateId != value)) + { + this.OnPersonsCertificateIdChanging(value); + this.SendPropertyChanging(); + this._PersonsCertificateId = value; + this.SendPropertyChanged("PersonsCertificateId"); + this.OnPersonsCertificateIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] + public string PersonId + { + get + { + return this._PersonId; + } + set + { + if ((this._PersonId != value)) + { + this.OnPersonIdChanging(value); + this.SendPropertyChanging(); + this._PersonId = value; + this.SendPropertyChanged("PersonId"); + this.OnPersonIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")] + public string CertificateId + { + get + { + return this._CertificateId; + } + set + { + if ((this._CertificateId != value)) + { + this.OnCertificateIdChanging(value); + this.SendPropertyChanging(); + this._CertificateId = value; + this.SendPropertyChanged("CertificateId"); + this.OnCertificateIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateCode", DbType="NVarChar(50)")] + public string CertificateCode + { + get + { + return this._CertificateCode; + } + set + { + if ((this._CertificateCode != value)) + { + this.OnCertificateCodeChanging(value); + this.SendPropertyChanging(); + this._CertificateCode = value; + this.SendPropertyChanged("CertificateCode"); + this.OnCertificateCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnit", DbType="NVarChar(500)")] + public string SendUnit + { + get + { + return this._SendUnit; + } + set + { + if ((this._SendUnit != value)) + { + this.OnSendUnitChanging(value); + this.SendPropertyChanging(); + this._SendUnit = value; + this.SendPropertyChanged("SendUnit"); + this.OnSendUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendDate", DbType="DateTime")] + public System.Nullable SendDate + { + get + { + return this._SendDate; + } + set + { + if ((this._SendDate != value)) + { + this.OnSendDateChanging(value); + this.SendPropertyChanging(); + this._SendDate = value; + this.SendPropertyChanged("SendDate"); + this.OnSendDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")] + public System.Nullable RegisterDate + { + get + { + return this._RegisterDate; + } + set + { + if ((this._RegisterDate != value)) + { + this.OnRegisterDateChanging(value); + this.SendPropertyChanging(); + this._RegisterDate = value; + this.SendPropertyChanged("RegisterDate"); + this.OnRegisterDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")] + public string Major + { + get + { + return this._Major; + } + set + { + if ((this._Major != value)) + { + this.OnMajorChanging(value); + this.SendPropertyChanging(); + this._Major = value; + this.SendPropertyChanged("Major"); + this.OnMajorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityDate", DbType="DateTime")] + public System.Nullable ValidityDate + { + get + { + return this._ValidityDate; + } + set + { + if ((this._ValidityDate != value)) + { + this.OnValidityDateChanging(value); + this.SendPropertyChanging(); + this._ValidityDate = value; + this.SendPropertyChanged("ValidityDate"); + this.OnValidityDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(2000)")] + public string Url + { + get + { + return this._Url; + } + set + { + if ((this._Url != value)) + { + this.OnUrlChanging(value); + this.SendPropertyChanging(); + this._Url = value; + this.SendPropertyChanged("Url"); + this.OnUrlChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonTrain")] public partial class Person_PersonTrain : INotifyPropertyChanging, INotifyPropertyChanged { @@ -137216,6 +138323,34 @@ namespace Model private System.Nullable _CreateDate; + private System.Nullable _Status; + + private string _ContactPersonOfPartyA; + + private string _ContactPersonOfPartyB; + + private string _ContactPersonPhoneOfPartyB; + + private string _ContactPersonEmailOfPartyB; + + private System.Nullable _ContractAmountExcludingTax; + + private string _PriceMethod; + + private System.Nullable _SignedOnDate; + + private System.Nullable _ContractStartDate; + + private System.Nullable _ContractEndDate; + + private string _PricingBasis; + + private string _SubcontractingMethod; + + private System.Nullable _IsItACentralizedPurchaseSupplier; + + private string _ContactUnitOfPartyA; + private EntityRef _Base_Depart; private EntityRef _Base_Project; @@ -137296,6 +138431,34 @@ namespace Model partial void OnRetentionmoneyChanged(); partial void OnCreateDateChanging(System.Nullable value); partial void OnCreateDateChanged(); + partial void OnStatusChanging(System.Nullable value); + partial void OnStatusChanged(); + partial void OnContactPersonOfPartyAChanging(string value); + partial void OnContactPersonOfPartyAChanged(); + partial void OnContactPersonOfPartyBChanging(string value); + partial void OnContactPersonOfPartyBChanged(); + partial void OnContactPersonPhoneOfPartyBChanging(string value); + partial void OnContactPersonPhoneOfPartyBChanged(); + partial void OnContactPersonEmailOfPartyBChanging(string value); + partial void OnContactPersonEmailOfPartyBChanged(); + partial void OnContractAmountExcludingTaxChanging(System.Nullable value); + partial void OnContractAmountExcludingTaxChanged(); + partial void OnPriceMethodChanging(string value); + partial void OnPriceMethodChanged(); + partial void OnSignedOnDateChanging(System.Nullable value); + partial void OnSignedOnDateChanged(); + partial void OnContractStartDateChanging(System.Nullable value); + partial void OnContractStartDateChanged(); + partial void OnContractEndDateChanging(System.Nullable value); + partial void OnContractEndDateChanged(); + partial void OnPricingBasisChanging(string value); + partial void OnPricingBasisChanged(); + partial void OnSubcontractingMethodChanging(string value); + partial void OnSubcontractingMethodChanged(); + partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable value); + partial void OnIsItACentralizedPurchaseSupplierChanged(); + partial void OnContactUnitOfPartyAChanging(string value); + partial void OnContactUnitOfPartyAChanged(); #endregion public PHTGL_Contract() @@ -137999,6 +139162,286 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int")] + public System.Nullable Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")] + public string ContactPersonOfPartyA + { + get + { + return this._ContactPersonOfPartyA; + } + set + { + if ((this._ContactPersonOfPartyA != value)) + { + this.OnContactPersonOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactPersonOfPartyA = value; + this.SendPropertyChanged("ContactPersonOfPartyA"); + this.OnContactPersonOfPartyAChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyB", DbType="VarChar(50)")] + public string ContactPersonOfPartyB + { + get + { + return this._ContactPersonOfPartyB; + } + set + { + if ((this._ContactPersonOfPartyB != value)) + { + this.OnContactPersonOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonOfPartyB = value; + this.SendPropertyChanged("ContactPersonOfPartyB"); + this.OnContactPersonOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonPhoneOfPartyB", DbType="VarChar(50)")] + public string ContactPersonPhoneOfPartyB + { + get + { + return this._ContactPersonPhoneOfPartyB; + } + set + { + if ((this._ContactPersonPhoneOfPartyB != value)) + { + this.OnContactPersonPhoneOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonPhoneOfPartyB = value; + this.SendPropertyChanged("ContactPersonPhoneOfPartyB"); + this.OnContactPersonPhoneOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonEmailOfPartyB", DbType="VarChar(50)")] + public string ContactPersonEmailOfPartyB + { + get + { + return this._ContactPersonEmailOfPartyB; + } + set + { + if ((this._ContactPersonEmailOfPartyB != value)) + { + this.OnContactPersonEmailOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonEmailOfPartyB = value; + this.SendPropertyChanged("ContactPersonEmailOfPartyB"); + this.OnContactPersonEmailOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractAmountExcludingTax", DbType="Decimal(18,2)")] + public System.Nullable ContractAmountExcludingTax + { + get + { + return this._ContractAmountExcludingTax; + } + set + { + if ((this._ContractAmountExcludingTax != value)) + { + this.OnContractAmountExcludingTaxChanging(value); + this.SendPropertyChanging(); + this._ContractAmountExcludingTax = value; + this.SendPropertyChanged("ContractAmountExcludingTax"); + this.OnContractAmountExcludingTaxChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="VarChar(50)")] + public string PriceMethod + { + get + { + return this._PriceMethod; + } + set + { + if ((this._PriceMethod != value)) + { + this.OnPriceMethodChanging(value); + this.SendPropertyChanging(); + this._PriceMethod = value; + this.SendPropertyChanged("PriceMethod"); + this.OnPriceMethodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignedOnDate", DbType="Date")] + public System.Nullable SignedOnDate + { + get + { + return this._SignedOnDate; + } + set + { + if ((this._SignedOnDate != value)) + { + this.OnSignedOnDateChanging(value); + this.SendPropertyChanging(); + this._SignedOnDate = value; + this.SendPropertyChanged("SignedOnDate"); + this.OnSignedOnDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractStartDate", DbType="Date")] + public System.Nullable ContractStartDate + { + get + { + return this._ContractStartDate; + } + set + { + if ((this._ContractStartDate != value)) + { + this.OnContractStartDateChanging(value); + this.SendPropertyChanging(); + this._ContractStartDate = value; + this.SendPropertyChanged("ContractStartDate"); + this.OnContractStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractEndDate", DbType="Date")] + public System.Nullable ContractEndDate + { + get + { + return this._ContractEndDate; + } + set + { + if ((this._ContractEndDate != value)) + { + this.OnContractEndDateChanging(value); + this.SendPropertyChanging(); + this._ContractEndDate = value; + this.SendPropertyChanged("ContractEndDate"); + this.OnContractEndDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PricingBasis", DbType="VarChar(50)")] + public string PricingBasis + { + get + { + return this._PricingBasis; + } + set + { + if ((this._PricingBasis != value)) + { + this.OnPricingBasisChanging(value); + this.SendPropertyChanging(); + this._PricingBasis = value; + this.SendPropertyChanged("PricingBasis"); + this.OnPricingBasisChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingMethod", DbType="VarChar(50)")] + public string SubcontractingMethod + { + get + { + return this._SubcontractingMethod; + } + set + { + if ((this._SubcontractingMethod != value)) + { + this.OnSubcontractingMethodChanging(value); + this.SendPropertyChanging(); + this._SubcontractingMethod = value; + this.SendPropertyChanged("SubcontractingMethod"); + this.OnSubcontractingMethodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsItACentralizedPurchaseSupplier", DbType="Int")] + public System.Nullable IsItACentralizedPurchaseSupplier + { + get + { + return this._IsItACentralizedPurchaseSupplier; + } + set + { + if ((this._IsItACentralizedPurchaseSupplier != value)) + { + this.OnIsItACentralizedPurchaseSupplierChanging(value); + this.SendPropertyChanging(); + this._IsItACentralizedPurchaseSupplier = value; + this.SendPropertyChanged("IsItACentralizedPurchaseSupplier"); + this.OnIsItACentralizedPurchaseSupplierChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] + public string ContactUnitOfPartyA + { + get + { + return this._ContactUnitOfPartyA; + } + set + { + if ((this._ContactUnitOfPartyA != value)) + { + this.OnContactUnitOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactUnitOfPartyA = value; + this.SendPropertyChanged("ContactUnitOfPartyA"); + this.OnContactUnitOfPartyAChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HTGL_Contract_Base_Depart", Storage="_Base_Depart", ThisKey="DepartId", OtherKey="DepartId", IsForeignKey=true)] public Base_Depart Base_Depart { @@ -179415,6 +180858,8 @@ namespace Model private EntityRef _WBS_UnitWork; + private EntityRef _WBS_WorkPackage; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -179448,6 +180893,7 @@ namespace Model this._Base_Unit = default(EntityRef); this._Solution_LargerHazardList = default(EntityRef); this._WBS_UnitWork = default(EntityRef); + this._WBS_WorkPackage = default(EntityRef); OnCreated(); } @@ -179550,6 +180996,10 @@ namespace Model { if ((this._WorkPackageId != value)) { + if (this._WBS_WorkPackage.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnWorkPackageIdChanging(value); this.SendPropertyChanging(); this._WorkPackageId = value; @@ -179785,6 +181235,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] + public WBS_WorkPackage WBS_WorkPackage + { + get + { + return this._WBS_WorkPackage.Entity; + } + set + { + WBS_WorkPackage previousValue = this._WBS_WorkPackage.Entity; + if (((previousValue != value) + || (this._WBS_WorkPackage.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._WBS_WorkPackage.Entity = null; + previousValue.Solution_LargerHazardListItem.Remove(this); + } + this._WBS_WorkPackage.Entity = value; + if ((value != null)) + { + value.Solution_LargerHazardListItem.Add(this); + this._WorkPackageId = value.WorkPackageId; + } + else + { + this._WorkPackageId = default(string); + } + this.SendPropertyChanged("WBS_WorkPackage"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -202272,7 +203756,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -206713,7 +208197,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -209443,7 +210927,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -210342,7 +211826,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -210719,7 +212203,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -210912,7 +212396,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -211145,7 +212629,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -211975,7 +213459,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -212960,7 +214444,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -215146,7 +216630,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -219938,7 +221422,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -220568,7 +222052,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -221263,7 +222747,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -221846,7 +223330,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -224275,6 +225759,8 @@ namespace Model private System.Nullable _TrainCount; + private System.Nullable _TrainCount1; + private string _AuditorId; private string _AuditorName; @@ -224873,6 +226359,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainCount1", DbType="Int")] + public System.Nullable TrainCount1 + { + get + { + return this._TrainCount1; + } + set + { + if ((this._TrainCount1 != value)) + { + this._TrainCount1 = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditorId", DbType="NVarChar(50)")] public string AuditorId { @@ -231083,6 +232585,8 @@ namespace Model private System.Nullable _Costs; + private EntitySet _Solution_LargerHazardListItem; + private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -231129,6 +232633,7 @@ namespace Model public WBS_WorkPackage() { + this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._WBS_ControlItemAndCycle = new EntitySet(new Action(this.attach_WBS_ControlItemAndCycle), new Action(this.detach_WBS_ControlItemAndCycle)); this._WBS_UnitWork = default(EntityRef); OnCreated(); @@ -231478,6 +232983,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_Solution_LargerHazardListItem", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] + public EntitySet Solution_LargerHazardListItem + { + get + { + return this._Solution_LargerHazardListItem; + } + set + { + this._Solution_LargerHazardListItem.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle { @@ -231545,6 +233063,18 @@ namespace Model } } + private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) + { + this.SendPropertyChanging(); + entity.WBS_WorkPackage = this; + } + + private void detach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) + { + this.SendPropertyChanging(); + entity.WBS_WorkPackage = null; + } + private void attach_WBS_ControlItemAndCycle(WBS_ControlItemAndCycle entity) { this.SendPropertyChanging();