diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8daaca47..96b6ff64 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-03-22.sql b/DataBase/版本日志/SGGLDB_V2023-03-22.sql index b5810bf1..bb7b8824 100644 Binary files a/DataBase/版本日志/SGGLDB_V2023-03-22.sql and b/DataBase/版本日志/SGGLDB_V2023-03-22.sql differ diff --git a/DataBase/版本日志/SGGLDB_V2023-03-23.sql b/DataBase/版本日志/SGGLDB_V2023-03-23.sql new file mode 100644 index 00000000..dedca655 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-23.sql @@ -0,0 +1,17 @@ + alter table PHTGL_BidDocumentsStandingBook alter column IsOnLine nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook alter column Bidding_SendTime nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook alter column Bidding_StartTime nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook ADD ProjectId nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook ADD State int + alter table AttachFile alter column ToKeyId nvarchar(100) + alter table AttachFile alter column AttachPath nvarchar(100) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'024F85B5-E19C-4AE9-9605-4779B61F7CF4',N'11f4f882-28a9-4610-a657-6a58336097d2',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'BF0DC6A6-ED3B-4CCA-8BBD-A107B98807BA',N'11f4f882-28a9-4610-a657-6a58336097d2',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'26C1682B-67AC-4E7D-BEEF-0458668F4AC2',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D2024122-FDB2-49A8-9128-35DB4B25A29B',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',1) + diff --git a/DataBase/版本日志/SGGLDB_V2023-03-24.sql b/DataBase/版本日志/SGGLDB_V2023-03-24.sql new file mode 100644 index 00000000..50ee428b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-24.sql @@ -0,0 +1,7 @@ + alter table PHTGL_BidDocumentsStandingBook alter column IsOnLine nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook alter column Bidding_SendTime nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook alter column Bidding_StartTime nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook ADD ProjectId nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook ADD State int + alter table AttachFile alter column ToKeyId nvarchar(100) + alter table AttachFile alter column AttachPath nvarchar(100) \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index 9c55a28f..bff813d0 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -137,6 +137,16 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'б깤̨',N'PHTGL/Filing/BidDocumentsStandingBook.aspx',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'024F85B5-E19C-4AE9-9605-4779B61F7CF4',N'11f4f882-28a9-4610-a657-6a58336097d2',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'BF0DC6A6-ED3B-4CCA-8BBD-A107B98807BA',N'11f4f882-28a9-4610-a657-6a58336097d2',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'26C1682B-67AC-4E7D-BEEF-0458668F4AC2',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D2024122-FDB2-49A8-9128-35DB4B25A29B',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',1) + GO INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'dedaf6f6-af14-4e4e-9fc6-164aa808cab9',N'̨ͬ',N'PHTGL/Filing/ContractFile.aspx',40,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 98f01b47..323a60a3 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4276,6 +4276,7 @@ /// public const string Pipeline_ComponentPath = "File\\Excel\\DataIn\\组件管理二维码信息导入.xlsx"; + #region 焊接报表 /// /// 管道焊接工作记录 @@ -4354,6 +4355,11 @@ #endregion #region 合同附件Id + /// + /// 招标文件台账模板 + /// + public const string BidDocumentsStandingBookIn = "File\\Excel\\DataIn\\BidDocumentsStandingBookIn.xlsx"; + /// /// 附件1 /// diff --git a/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs index ac08f4ca..ff5d9613 100644 --- a/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs +++ b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs @@ -1,4 +1,5 @@ using FineUIPro; +using MiniExcelLibs.Attributes; using System; using System.Collections; using System.Collections.Generic; @@ -39,8 +40,10 @@ namespace BLL (string.IsNullOrEmpty(table.ProposedInviter) || x.ProposedInviter.Contains(table.ProposedInviter)) && (string.IsNullOrEmpty(table.ApprovePersonFormCode) || x.ApprovePersonFormCode.Contains(table.ApprovePersonFormCode)) && (string.IsNullOrEmpty(table.BidWinner) || x.BidWinner.Contains(table.BidWinner)) && - (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) - select x + (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) && + (string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId))&& + (table.State == null||x.State==table.State) + select x ; return q.ToList(); @@ -80,6 +83,8 @@ namespace BLL x.ApprovePersonFormCode, x.BidWinner, x.SetSubReviewCode, + x.ProjectId, + x.State }; } @@ -112,6 +117,8 @@ namespace BLL ApprovePersonFormCode = newtable.ApprovePersonFormCode, BidWinner = newtable.BidWinner, SetSubReviewCode = newtable.SetSubReviewCode, + ProjectId= newtable.ProjectId, + State=newtable.State, }; db.PHTGL_BidDocumentsStandingBook.InsertOnSubmit(table); db.SubmitChanges(); @@ -147,6 +154,8 @@ namespace BLL table.ApprovePersonFormCode = newtable.ApprovePersonFormCode; table.BidWinner = newtable.BidWinner; table.SetSubReviewCode = newtable.SetSubReviewCode; + table.ProjectId=newtable.ProjectId; + table.State=newtable.State; db.SubmitChanges(); } @@ -173,4 +182,5 @@ namespace BLL } } + } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx new file mode 100644 index 00000000..5e568135 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index a04d6814..17e7a92f 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1158,6 +1158,7 @@ + @@ -11736,6 +11737,13 @@ BidDocumentsStandingBookEdit.aspx + + BidDocumentsStandingBookIn.aspx + ASPXCodeBehind + + + BidDocumentsStandingBookIn.aspx + ContractFile.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index 8e82becb..c74bda6c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx @@ -112,13 +112,13 @@ DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index a5faefa7..715faddb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -68,7 +68,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { List GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId); this.BindGrid(GetWeldingDailyItem); // 初始化页面 - } + } else { this.BindGrid(null); @@ -196,17 +196,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage private void BindGrid(List weldingDailyItem) { var aw = this.Grid1.SelectedRowIDArray; - DataTable dt = null; var task = new List(); var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x; if (weldingDailyItem != null) { var weldJointIds = (from x in list - where ( x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text) + where (x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text) && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId - - select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); + + select x).ToList(); + weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); task = weldJointIds; //foreach (var weldJointId in weldJointIds) //{ @@ -224,10 +224,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } else { - var weldJointIds = (from x in list + var weldJointIds = (from x in list where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text) && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/ - select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); + select x).ToList(); + weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); task = weldJointIds; //foreach (var weldJointId in weldJointIds) //{ @@ -269,8 +270,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (weldingDailyItem != null) { var Dailytask = (from x in Funs.DB.View_HJGL_WeldingTask - where x.WeldingDailyId == this.WeldingDailyId - select x).ToList(); + where x.WeldingDailyId == this.WeldingDailyId + select new + { + x.PipelineCode, + x.WeldTaskId + }).Distinct().ToList(); if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) { Dailytask = Dailytask.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList(); diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs index 2dc23b3a..c660429e 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs @@ -298,10 +298,10 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement } PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } + } } - + protected void btnSubmit_Click(object sender, EventArgs e) { if (Save()) diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx index 96f6cfae..8a2a6184 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx @@ -10,7 +10,7 @@ word-break: break-all; } - .f-grid-colheader-text { + .f-grid-colheader-text { white-space: normal; word-break: break-all; } @@ -23,51 +23,64 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> - + - - <%-- --%> - - - - + --%> <%-- --%> + + - - - + + + + + + + + + + + + - - + + @@ -78,6 +91,12 @@ + + + + + @@ -93,7 +112,7 @@ - - - - - + --%> <%-- @@ -155,6 +173,10 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Width="1000px" Height="420px"> + <%-- private void BindGrid() { - string strSql = @"select - BidBook.BidDocumentsStandingBookId - ,ActPlan.EPCCode - ,Project.ShortName - ,Project.ProjectCode - ,(case IsOnLine - when '1' then '线上' - when '0'then '线下' end )as IsOnLine - ,BidDoc.BidType - ,ActPlan.ActionPlanCode - ,BidDoc.BidDocumentsCode - ,ActPlan.BidProject - ,BidBook.ShortListApprovalCode - ,BidBook.ProposedInviter - ,BidDoc.Bidding_SendTime - ,BidDoc.Bidding_StartTime - ,BidBook.ApprovePersonFormCode - ,BidBook.BidWinner - ,SetSub.SetSubReviewCode - from PHTGL_BidDocumentsStandingBook as BidBook - left join PHTGL_SetSubReview as SetSub on SetSub.SetSubReviewCode=BidBook.SetSubReviewCode - left join PHTGL_BidApproveUserReview as BidUser on BidUser.ApproveUserReviewID =SetSub.ApproveUserReviewID - left join PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId= BidUser.BidDocumentsReviewId - left join PHTGL_ActionPlanFormation as ActPlan on ActPlan.ActionPlanID =BidDoc.ActionPlanID - left join Base_Project as Project on Project.ProjectId=ActPlan.ProjectID where 1=1 "; - - List listStr = new List(); - + Model.PHTGL_BidDocumentsStandingBook _BidDocumentsStandingBook = new Model.PHTGL_BidDocumentsStandingBook(); + if (!(this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId)) { - strSql += " and ActPlan.ProjectId =@ProjectId"; - - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; } if (!string.IsNullOrEmpty(drpDepartId.SelectedValue) ) { @@ -103,21 +76,21 @@ namespace FineUIPro.Web.PHTGL.Filing } if (!string.IsNullOrEmpty(txtProjectCode.Text)) { - + _BidDocumentsStandingBook.ProjectCode= txtProjectCode.Text; } if (!string.IsNullOrEmpty(txtShortName.Text)) { - + _BidDocumentsStandingBook.ProjectShortName= txtShortName.Text; } if (!string.IsNullOrEmpty(txtContractNum.Text)) { - + _BidDocumentsStandingBook.EPCCode= txtContractNum.Text; } - if (!string.IsNullOrEmpty(txtContractName.Text)) - { - } - + var q= BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookByModle(_BidDocumentsStandingBook); + Grid1.RecordCount = q.Count; + Grid1.DataSource=q; + Grid1.DataBind(); } #endregion @@ -184,7 +157,7 @@ namespace FineUIPro.Web.PHTGL.Filing txtShortName.Text = string.Empty; txtContractNum.Text = string.Empty; txtContractName.Text = string.Empty; - txtSubConstruction.Text = string.Empty; + //txtSubConstruction.Text = string.Empty; } #region 编辑 @@ -213,20 +186,21 @@ namespace FineUIPro.Web.PHTGL.Filing /// private void EditData() { - //if (Grid1.SelectedRowIndexArray.Length == 0) - //{ - // Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); - // return; - //} - //string id = Grid1.SelectedRowID; - //var contract = BLL.ContractService.GetContractById(id); - //Model.PHTGL_Contract _Contract = BLL.ContractService.GetContractById(id); - //_Contract.ApproveState = 0; - //ContractService.UpdateContract(_Contract); - //if (contract != null) - //{ - // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractFormationEdit.aspx?ContractId={0}", id, "编辑 - "))); - //} + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + var model=BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(id); + if (model != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BidDocumentsStandingBookEdit.aspx?BidDocumentsStandingBookId={0}", id, "编辑 - "))); + } + } + protected void btnEdit_Click(object sender, EventArgs e) + { + EditData(); } #endregion @@ -318,10 +292,12 @@ namespace FineUIPro.Web.PHTGL.Filing if (buttonList.Contains(Const.BtnModify)) { // btnMenuEdit.Hidden = false; + btnEdit.Hidden = false; } if (buttonList.Contains(Const.BtnDelete)) { // btnMenuDelete.Hidden = false; + btnDelete.Hidden = false; } } } @@ -388,5 +364,78 @@ namespace FineUIPro.Web.PHTGL.Filing // return sb.ToString(); // } #endregion + + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("BidDocumentsStandingBookIn.aspx?", "导入 - "))); + + } + public string ConvertState(object State) + { + string StateName = string.Empty; + if (State!=null&&!string.IsNullOrEmpty(State.ToString())) + { + switch (State.ToString()) + { + case "0": + StateName = "未提交"; + break; + case "1": + StateName = "已提交"; + break; + default: + StateName = "未提交"; + break; + } + + } + else + { + StateName = "未提交"; + } + return StateName; + } + + protected void btnDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + bool isShow = false; + if (Grid1.SelectedRowIndexArray.Length == 1) + { + isShow = true; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (this.judgementDelete(rowID, isShow)) + { + var p = BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(rowID); + if (p != null) + { + if (p.State==1) + { + ShowNotify(message: "已提交，删除失败!", MessageBoxIcon.Error); + return; + + } + // BLL.LogService.AddSys_Log(this.CurrUser, p.ContractName, p.ContractId, BLL.Const.ContractMenuId, BLL.Const.BtnDelete); + BLL.BidDocStandingBookService.DeletePHTGL_BidDocumentsStandingBookById(rowID); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidUnit", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidNotice", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ActionPlan", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidDocuments", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ApprovePersonForm", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-SetSubReview", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID +"-ShortListApproval", Const.BidDocumentsStandingBookMenuId); + } + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs index cf9270dd..571d9907 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs @@ -104,15 +104,6 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.TextBox txtContractName; - /// - /// txtSubConstruction 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtSubConstruction; - /// /// btnSearch 控件。 /// @@ -131,6 +122,24 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button Button1; + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + /// /// btnNew 控件。 /// @@ -140,6 +149,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button btnNew; + /// + /// btnEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnEdit; + /// /// btnOut 控件。 /// @@ -150,13 +168,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.Button btnOut; /// - /// btnImport 控件。 + /// btnDelete 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnImport; + protected global::FineUIPro.Button btnDelete; /// /// lblPageIndex 控件。 @@ -167,6 +185,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::System.Web.UI.WebControls.Label lblPageIndex; + /// + /// lbImageUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl; + /// /// ToolbarSeparator1 控件。 /// @@ -202,5 +229,14 @@ namespace FineUIPro.Web.PHTGL.Filing /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; } } diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx index 9906e505..91a343f7 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx @@ -15,91 +15,116 @@ - + - - - - + + + + - - + + + + - + - - - - - - - - - - + - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs index df09a71e..ed93beac 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs @@ -6,6 +6,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using BLL; +using FineUIPro.Web.PHTGL.BiddingManagement; namespace FineUIPro.Web.PHTGL.Filing { @@ -33,27 +34,37 @@ namespace FineUIPro.Web.PHTGL.Filing if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - BLL.PHTGL_SetSubReviewService.InitGetSetSubCompleteDropDownList(DropSetSubReviewCode, this.CurrUser.PersonId, this.CurrUser.LoginProjectId, false); + //BLL.PHTGL_SetSubReviewService.InitGetSetSubCompleteDropDownList(DropSetSubReviewCode, this.CurrUser.PersonId, this.CurrUser.LoginProjectId, false); ////权限按钮方法 - this.GetButtonPower(); this.BidDocumentsStandingBookId = Request.Params["BidDocumentsStandingBookId"]; + this.GetButtonPower(); + if (!string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) { Model.PHTGL_BidDocumentsStandingBook model = BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(this.BidDocumentsStandingBookId); if (model != null) { - DropSetSubReviewCode.SelectedValue = model.SetSubReviewCode; - cbIsOnLine.Checked = model.IsOnLine==1?true:false; - txtShortListApprovalCode.Text= model.ShortListApprovalCode; - txtProposedInviter.Text=model.ProposedInviter; - txtApprovePersonFormCode.Text= model.ApprovePersonFormCode; - txtBidWinner.Text= model.BidWinner; - DropSetSubReviewCode_SelectedIndexChanged(null,null); + this.txtEPCCode.Text = model.EPCCode; + this.txtProjectShortName.Text = model.ProjectShortName; + this.txtProjectCode.Text = model.ProjectCode; + this.txtIsOnLine.Text = model.IsOnLine; + this.txtBidType.Text = model.BidType; + this.txtActionPlanCode.Text = model.ActionPlanCode; + this.txtBidDocumentsCode.Text = model.BidDocumentsCode; + this.txtBidProject.Text = model.BidProject; + this.txtShortListApprovalCode.Text = model.ShortListApprovalCode; + this.txtProposedInviter.Text = model.ProposedInviter; + this.txtBidding_SendTime.Text = model.Bidding_SendTime; + this.txtBidding_StartTime.Text = model.Bidding_StartTime; + this.txtApprovePersonFormCode.Text = model.ApprovePersonFormCode; + this.txtBidWinner.Text = model.BidWinner; + this.txtSetSubReviewCode.Text = model.SetSubReviewCode; } } } } + #region 保存提交 /// /// 保存按钮 /// @@ -62,30 +73,119 @@ namespace FineUIPro.Web.PHTGL.Filing protected void btnSave_Click(object sender, EventArgs e) { Model.PHTGL_BidDocumentsStandingBook table = new Model.PHTGL_BidDocumentsStandingBook(); - table.IsOnLine = cbIsOnLine.Checked ? 1 : 0 ; - table.SetSubReviewCode = this.DropSetSubReviewCode.SelectedValue; + table.EPCCode = this.txtEPCCode.Text; + table.ProjectShortName = this.txtProjectShortName.Text; + table.ProjectCode = this.txtProjectCode.Text; + table.IsOnLine = this.txtIsOnLine.Text; + table.BidType = this.txtBidType.Text; + table.ActionPlanCode = this.txtActionPlanCode.Text; + table.BidDocumentsCode = this.txtBidDocumentsCode.Text; + table.BidProject = this.txtBidProject.Text; table.ShortListApprovalCode = this.txtShortListApprovalCode.Text; table.ProposedInviter = this.txtProposedInviter.Text; + table.Bidding_SendTime = this.txtBidding_SendTime.Text; + table.Bidding_StartTime = this.txtBidding_StartTime.Text; table.ApprovePersonFormCode = this.txtApprovePersonFormCode.Text; table.BidWinner = this.txtBidWinner.Text; + table.SetSubReviewCode = this.txtSetSubReviewCode.Text; + table.ProjectId = this.CurrUser.LoginProjectId; + table.State = 0; if (string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) { table.BidDocumentsStandingBookId = SQLHelper.GetNewID(typeof(Model.PHTGL_BidDocumentsStandingBook)); - BidDocumentsStandingBookId = table.BidDocumentsStandingBookId; BLL.BidDocStandingBookService.AddPHTGL_BidDocumentsStandingBook(table); } else { - var model= BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(BidDocumentsStandingBookId); - if (model!=null) + table.BidDocumentsStandingBookId = this.BidDocumentsStandingBookId; + var q = BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(table.BidDocumentsStandingBookId); + if (q != null) { - table.BidDocumentsStandingBookId = this.BidDocumentsStandingBookId; BLL.BidDocStandingBookService.UpdatePHTGL_BidDocumentsStandingBook(table); + + } + else + { + BLL.BidDocStandingBookService.AddPHTGL_BidDocumentsStandingBook(table); + + } + } + // PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidUnit", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传中标单位投标文件，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidNotice", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传中标通知书，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传实施计划文件，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传招标文件，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传评委名单审批表文件，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传确定中标人审批表文件，无法提交！", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.BidDocumentsStandingBookMenuId)) + { + ShowNotify("未上传短名单审批表文件，无法提交！", MessageBoxIcon.Warning); + return; + } + Model.PHTGL_BidDocumentsStandingBook table = new Model.PHTGL_BidDocumentsStandingBook(); + table.EPCCode = this.txtEPCCode.Text; + table.ProjectShortName = this.txtProjectShortName.Text; + table.ProjectCode = this.txtProjectCode.Text; + table.IsOnLine = this.txtIsOnLine.Text; + table.BidType = this.txtBidType.Text; + table.ActionPlanCode = this.txtActionPlanCode.Text; + table.BidDocumentsCode = this.txtBidDocumentsCode.Text; + table.BidProject = this.txtBidProject.Text; + table.ShortListApprovalCode = this.txtShortListApprovalCode.Text; + table.ProposedInviter = this.txtProposedInviter.Text; + table.Bidding_SendTime = this.txtBidding_SendTime.Text; + table.Bidding_StartTime = this.txtBidding_StartTime.Text; + table.ApprovePersonFormCode = this.txtApprovePersonFormCode.Text; + table.BidWinner = this.txtBidWinner.Text; + table.SetSubReviewCode = this.txtSetSubReviewCode.Text; + table.ProjectId = this.CurrUser.LoginProjectId; + table.State = 1; + if (string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) + { + table.BidDocumentsStandingBookId = SQLHelper.GetNewID(typeof(Model.PHTGL_BidDocumentsStandingBook)); + BLL.BidDocStandingBookService.AddPHTGL_BidDocumentsStandingBook(table); + + } + else + { + table.BidDocumentsStandingBookId = this.BidDocumentsStandingBookId; + var q = BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(table.BidDocumentsStandingBookId); + if (q != null) + { + BLL.BidDocStandingBookService.UpdatePHTGL_BidDocumentsStandingBook(table); + } else { - table.BidDocumentsStandingBookId = this.BidDocumentsStandingBookId; BLL.BidDocStandingBookService.AddPHTGL_BidDocumentsStandingBook(table); } @@ -93,6 +193,8 @@ namespace FineUIPro.Web.PHTGL.Filing PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } + #endregion + #region 获取按钮权限 /// /// 获取按钮权限 @@ -101,12 +203,13 @@ namespace FineUIPro.Web.PHTGL.Filing /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.BidDocumentsStandingBookMenuId); - if (buttonList.Count() > 0) + if (!string .IsNullOrEmpty(BidDocumentsStandingBookId)) { - if (buttonList.Contains(BLL.Const.BtnSave)) + var q = BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(BidDocumentsStandingBookId); + if (q != null&& q.State==1) { - this.btnSave.Hidden = false; + btnSave.Hidden = true; + btnSubmit.Hidden=true; } } } @@ -114,57 +217,136 @@ namespace FineUIPro.Web.PHTGL.Filing #region 附件上传 /// - /// 上传附件 + /// 中标单位投标文件 /// /// /// - protected void btnAttachUrl_Click(object sender, EventArgs e) + protected void btnAttachUrl_BidUnit_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) { BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", this.BidDocumentsStandingBookId+ "-Notice", BLL.Const.BidDocumentsStandingBookMenuId))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId+ "-BidUnit", BLL.Const.BidDocumentsStandingBookMenuId))); } /// - /// 情况说明附件 + /// 中标通知书 /// /// /// - protected void btnAttachUrl_Remark_Click(object sender, EventArgs e) + protected void btnAttachUrl_BidNotice_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) { BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", this.BidDocumentsStandingBookId+ "-Bidder", BLL.Const.BidDocumentsStandingBookMenuId))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId+ "-BidNotice", BLL.Const.BidDocumentsStandingBookMenuId))); + } + /// + /// 实施计划文件 + /// + /// + /// + protected void btnAttachUrl_ActionPlanCode_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) + { + BidDocumentsStandingBookId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.BidDocumentsStandingBookMenuId))); + + } + /// + /// 招标文件 + /// + /// + /// + + protected void btnAttachUrl_BidDocumentsCode_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) + { + BidDocumentsStandingBookId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.BidDocumentsStandingBookMenuId))); + } + /// + /// 评委名单审批表文件 + /// + /// + /// + + protected void btnAttachUrl_ApprovePersonFormCode_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) + { + BidDocumentsStandingBookId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.BidDocumentsStandingBookMenuId))); + } + /// + /// 确定中标人审批表文件 + /// + /// + /// + + protected void btnAttachUrl_SetSubReviewCode_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) + { + BidDocumentsStandingBookId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.BidDocumentsStandingBookMenuId))); + } + /// + /// 短名单审批表文件 + /// + /// + /// + protected void btnAttachUrl_ShortListApprovalCode_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(BidDocumentsStandingBookId)) + { + BidDocumentsStandingBookId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", + this.BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.BidDocumentsStandingBookMenuId))); } #endregion - protected void DropSetSubReviewCode_SelectedIndexChanged(object sender, EventArgs e) - { - var _SetSub= BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewBySetSubReviewCode(DropSetSubReviewCode.SelectedValue); - var _BidApprove= PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSub.ApproveUserReviewID); - var _BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_BidApprove.BidDocumentsReviewId); - var _ActPlan = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(_BidDoc.ActionPlanID); - var _Project=BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + + //protected void DropSetSubReviewCode_SelectedIndexChanged(object sender, EventArgs e) + //{ + // var _SetSub= BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewBySetSubReviewCode(DropSetSubReviewCode.SelectedValue); + // var _BidApprove= PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSub.ApproveUserReviewID); + // var _BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_BidApprove.BidDocumentsReviewId); + // var _ActPlan = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(_BidDoc.ActionPlanID); + // var _Project=BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); - this.txtEPCCode.Text = _ActPlan.EPCCode; - this.txtProjectShortName.Text = _Project.ShortName; - this.txtProjectCode.Text = _Project.ProjectCode; - this.txtBidType.Text = _BidDoc.BidType; - this.txtBidProject.Text = _ActPlan.BidProject; - this.txtActionPlanCode.Text = _ActPlan.ActionPlanCode; - this.txtBidDocumentsCode.Text = _BidDoc.BidDocumentsCode; - if (_BidDoc.Bidding_SendTime != null) - { - this.txtBidding_SendTime.Text = string.Format("{0:yyyy-MM-dd}", _BidDoc.Bidding_SendTime); - } - if (_BidDoc.Bidding_StartTime != null) - { - this.txtBidding_StartTime.Text = string.Format("{0:yyyy-MM-dd}", _BidDoc.Bidding_StartTime); - } - //this.txtApprovePersonFormCode.Text = model.ApprovePersonFormCode; - } + // this.txtEPCCode.Text = _ActPlan.EPCCode; + // this.txtProjectShortName.Text = _Project.ShortName; + // this.txtProjectCode.Text = _Project.ProjectCode; + // this.txtBidType.Text = _BidDoc.BidType; + // this.txtBidProject.Text = _ActPlan.BidProject; + // this.txtActionPlanCode.Text = _ActPlan.ActionPlanCode; + // this.txtBidDocumentsCode.Text = _BidDoc.BidDocumentsCode; + // if (_BidDoc.Bidding_SendTime != null) + // { + // this.txtBidding_SendTime.Text = string.Format("{0:yyyy-MM-dd}", _BidDoc.Bidding_SendTime); + // } + // if (_BidDoc.Bidding_StartTime != null) + // { + // this.txtBidding_StartTime.Text = string.Format("{0:yyyy-MM-dd}", _BidDoc.Bidding_StartTime); + // } + // //this.txtApprovePersonFormCode.Text = model.ApprovePersonFormCode; + // } + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs index 028beb29..7a21525e 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs @@ -41,24 +41,6 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Form SimpleForm1; - /// - /// DropSetSubReviewCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList DropSetSubReviewCode; - - /// - /// cbIsOnLine 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.CheckBox cbIsOnLine; - /// /// txtEPCCode 控件。 /// @@ -87,22 +69,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.TextBox txtProjectCode; /// - /// txtActionPlanCode 控件。 + /// txtIsOnLine 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtActionPlanCode; - - /// - /// txtBidDocumentsCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtBidDocumentsCode; + protected global::FineUIPro.TextBox txtIsOnLine; /// /// txtBidType 控件。 @@ -122,6 +95,60 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.TextBox txtBidProject; + /// + /// txtActionPlanCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtActionPlanCode; + + /// + /// btnAttachUrl_ActionPlanCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl_ActionPlanCode; + + /// + /// txtBidDocumentsCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidDocumentsCode; + + /// + /// btnAttachUrl_BidDocumentsCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl_BidDocumentsCode; + + /// + /// txtProposedInviter 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProposedInviter; + + /// + /// txtBidWinner 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidWinner; + /// /// txtBidding_SendTime 控件。 /// @@ -150,13 +177,31 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.TextBox txtApprovePersonFormCode; /// - /// txtBidWinner 控件。 + /// btnAttachUrl_ApprovePersonFormCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtBidWinner; + protected global::FineUIPro.Button btnAttachUrl_ApprovePersonFormCode; + + /// + /// txtSetSubReviewCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSetSubReviewCode; + + /// + /// btnAttachUrl_SetSubReviewCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl_SetSubReviewCode; /// /// txtShortListApprovalCode 控件。 @@ -168,31 +213,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.TextBox txtShortListApprovalCode; /// - /// btnAttachUrl_Remark 控件。 + /// btnAttachUrl_ShortListApprovalCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnAttachUrl_Remark; - - /// - /// txtProposedInviter 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProposedInviter; - - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; + protected global::FineUIPro.Button btnAttachUrl_ShortListApprovalCode; /// /// Toolbar1 控件。 @@ -203,6 +230,24 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// btnAttachUrl_BidNotice 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl_BidNotice; + + /// + /// btnAttachUrl_BidUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl_BidUnit; + /// /// btnSave 控件。 /// @@ -212,6 +257,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button btnSave; + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx new file mode 100644 index 00000000..a131d6f4 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx @@ -0,0 +1,123 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BidDocumentsStandingBookIn.aspx.cs" Inherits="FineUIPro.Web.PHTGL.Filing.BidDocumentsStandingBookIn" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs new file mode 100644 index 00000000..437eb25b --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs @@ -0,0 +1,355 @@ +using BLL; +using FineUIPro.Web.HJGL.WeldingManage; +using MiniExcelLibs; +using Model; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; + +namespace FineUIPro.Web.PHTGL.Filing +{ + public partial class BidDocumentsStandingBookIn : PageBase + { + #region 定义变量 + /// + /// 上传预设的虚拟路径 + /// + private string initPath = Const.ExcelUrl; + + /// + /// 安装组件集合 + /// + public static List BidDocStandingBookList = new List(); + + /// + /// 错误集合 + /// + public static string errorInfos = string.Empty; + + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.hdFileName.Text = string.Empty; + if (BidDocStandingBookList != null) + { + BidDocStandingBookList.Clear(); + } + errorInfos = string.Empty; + + } + } + #endregion + + #region 审核 + /// + /// 审核 + /// + /// + /// + protected void btnAudit_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xlsx") + { + ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (BidDocStandingBookList != null) + { + BidDocStandingBookList.Clear(); + } + if (!string.IsNullOrEmpty(errorInfos)) + { + errorInfos = string.Empty; + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + Alert alert = new Alert + { + Message = "'" + ex.Message + "'", + Target = Target.Self + }; + alert.Show(); + //ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 读Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData(string fileName) + { + // var rows =Funs.LINQToDataTable(MiniExcel.Query(fileName).ToList()) ; + var ds = MiniExcel.Query(fileName).ToList(); + var columns = MiniExcel.GetColumns(fileName); + var cnt = columns.Count; + var reposedata = AddDatasetToSQL(ds, cnt); + if (reposedata.code == 1) + { + ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success); + } + else + { + Alert alert = new Alert + { + Message = reposedata.message, + Target = Target.Self + }; + alert.Show(); + //ShowNotify(responeData.message, MessageBoxIcon.Success); + + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集行数 + /// + private Model.ResponeData AddDatasetToSQL(List pds, int count) + { + Model.ResponeData responeData = new Model.ResponeData(); + // string result = string.Empty; + List result = new List(); + //pds = BLL.Funs.FilterBlankLines(pds); + if (count < 15) + { + responeData.code = 0; + responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列"; + return responeData; + } + if (pds.Count > 0 && pds != null) + { + + for (int i = 1; i < pds.Count; i++) + { + Model.PHTGL_BidDocumentsStandingBook _BidDocumentsStandingBook = new PHTGL_BidDocumentsStandingBook(); + _BidDocumentsStandingBook.BidDocumentsStandingBookId = SQLHelper.GetNewID(); + _BidDocumentsStandingBook.State = 0; + _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; + _BidDocumentsStandingBook.EPCCode = pds[i].A; + _BidDocumentsStandingBook.ProjectShortName = pds[i].B; + _BidDocumentsStandingBook.ProjectCode = pds[i].C; + _BidDocumentsStandingBook.IsOnLine = pds[i].D; + _BidDocumentsStandingBook.BidType = pds[i].E; + _BidDocumentsStandingBook.ActionPlanCode = pds[i].F; + _BidDocumentsStandingBook.BidDocumentsCode = pds[i].G; + _BidDocumentsStandingBook.BidProject = pds[i].H; + _BidDocumentsStandingBook.ShortListApprovalCode = pds[i].I; + _BidDocumentsStandingBook.ProposedInviter = pds[i].J; + _BidDocumentsStandingBook.Bidding_SendTime = pds[i].K; + _BidDocumentsStandingBook.Bidding_StartTime = pds[i].L; + _BidDocumentsStandingBook.ApprovePersonFormCode = pds[i].M; + _BidDocumentsStandingBook.BidWinner = pds[i].N; + _BidDocumentsStandingBook.SetSubReviewCode = pds[i].O; + BidDocStandingBookList.Add(_BidDocumentsStandingBook); + + //if (col24 != null) + //{ + + //} + //else + //{ + // result.Add("第" + (i + 1).ToString() + "行," + "壁厚" + "," + "此项为必填项！" + "|"); + //} + + } + if (result.Count > 0) + { + BidDocStandingBookList.Clear(); + // result = result.Substring(0, result.LastIndexOf("|")); + errorInfos = string.Join("|", result.Distinct()); + //Alert alert = new Alert(); + //alert.Message = result; + //alert.Target = Target.Self; + //alert.Show(); + responeData.code = 0; + responeData.message = errorInfos; + } + else + { + errorInfos = string.Empty; + + + } + + } + else + { + responeData.code = 0; + responeData.message = "导入数据为空！"; + } + + + return responeData; + } + + + #endregion + #endregion + + #region 导入 + /// + /// 导入 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(errorInfos)) + { + if (!string.IsNullOrEmpty(this.hdFileName.Text)) + { + if (BidDocStandingBookList.Count > 0) + { + this.Grid1.Hidden = false; + this.Grid1.DataIDField = "BidDocumentsStandingBookId"; + this.Grid1.DataSource = BidDocStandingBookList; + this.Grid1.DataBind(); + Grid1.RecordCount = BidDocStandingBookList.Count; + } + + } + else + { + ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning); + } + } + + #endregion + + #region 提交 + /// + /// 提交 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(errorInfos)) + { + if (BidDocStandingBookList.Count > 0) + { + BidDocStandingBookService.AddBulkPHTGL_BidDocumentsStandingBook(BidDocStandingBookList); + } + int a = BidDocStandingBookList.Count(); + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + string filePath = initFullPath + this.hdFileName.Text; + if (filePath != string.Empty && System.IO.File.Exists(filePath)) + { + System.IO.File.Delete(filePath);//删除上传的XLS文件 + } + ShowNotify("导入成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 获取名称 + public string ConvertPipelineId(object PipelineId) + { + string StateName = string.Empty; + if (!string.IsNullOrEmpty(PipelineId.ToString())) + { + + if (PipelineId != null) + { + string txt = PipelineService.GetPipelineByPipelineId(PipelineId.ToString()).PipelineCode; + + return txt; + } + return ""; + } + return StateName; + } + + #endregion + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.BidDocumentsStandingBookIn; + string filePath = Const.BidDocumentsStandingBookIn; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + this.Grid1.DataSource = BidDocStandingBookList; + this.Grid1.DataBind(); + Grid1.RecordCount = BidDocStandingBookList.Count; + } + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.designer.cs new file mode 100644 index 00000000..5316224a --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.Filing +{ + + + public partial class BidDocumentsStandingBookIn + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// hdFileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdFileName; + + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// btnAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAudit; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// fuAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload fuAttachUrl; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e392372a..f4fdd7ff 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -83399,7 +83399,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")] public string CanWelderCode { get @@ -83419,7 +83419,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")] public string CanWelderId { get @@ -151267,7 +151267,7 @@ namespace Model private string _ProjectCode; - private System.Nullable _IsOnLine; + private string _IsOnLine; private string _BidType; @@ -151281,9 +151281,9 @@ namespace Model private string _ProposedInviter; - private System.Nullable _Bidding_SendTime; + private string _Bidding_SendTime; - private System.Nullable _Bidding_StartTime; + private string _Bidding_StartTime; private string _ApprovePersonFormCode; @@ -151291,6 +151291,10 @@ namespace Model private string _SetSubReviewCode; + private string _ProjectId; + + private System.Nullable _State; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -151303,7 +151307,7 @@ namespace Model partial void OnProjectShortNameChanged(); partial void OnProjectCodeChanging(string value); partial void OnProjectCodeChanged(); - partial void OnIsOnLineChanging(System.Nullable value); + partial void OnIsOnLineChanging(string value); partial void OnIsOnLineChanged(); partial void OnBidTypeChanging(string value); partial void OnBidTypeChanged(); @@ -151317,9 +151321,9 @@ namespace Model partial void OnShortListApprovalCodeChanged(); partial void OnProposedInviterChanging(string value); partial void OnProposedInviterChanged(); - partial void OnBidding_SendTimeChanging(System.Nullable value); + partial void OnBidding_SendTimeChanging(string value); partial void OnBidding_SendTimeChanged(); - partial void OnBidding_StartTimeChanging(System.Nullable value); + partial void OnBidding_StartTimeChanging(string value); partial void OnBidding_StartTimeChanged(); partial void OnApprovePersonFormCodeChanging(string value); partial void OnApprovePersonFormCodeChanged(); @@ -151327,6 +151331,10 @@ namespace Model partial void OnBidWinnerChanged(); partial void OnSetSubReviewCodeChanging(string value); partial void OnSetSubReviewCodeChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnStateChanging(System.Nullable value); + partial void OnStateChanged(); #endregion public PHTGL_BidDocumentsStandingBook() @@ -151414,8 +151422,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOnLine", DbType="Int")] - public System.Nullable IsOnLine + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOnLine", DbType="NVarChar(100)")] + public string IsOnLine { get { @@ -151554,8 +151562,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_SendTime", DbType="DateTime")] - public System.Nullable Bidding_SendTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_SendTime", DbType="NVarChar(100)")] + public string Bidding_SendTime { get { @@ -151574,8 +151582,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_StartTime", DbType="DateTime")] - public System.Nullable Bidding_StartTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_StartTime", DbType="NVarChar(100)")] + public string Bidding_StartTime { get { @@ -151654,6 +151662,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(100)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [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(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -236474,7 +236522,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")] public string CanWelderCode { get @@ -236490,7 +236538,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")] public string CanWelderId { get