diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql new file mode 100644 index 00000000..dd699a98 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql @@ -0,0 +1,90 @@ +CREATE TABLE [dbo].[Inspection_Test_Plan]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [CNProfessionalId] [nvarchar](50) NULL, + [PlanCode] [nvarchar](50) NULL, + [PlanName] [nvarchar](50) NULL, + [ApprovalDate] [datetime] NULL, + [AuditMan] [nvarchar](50) NULL, + [ApprovalMan] [nvarchar](50) NULL, + [Remarks] [nvarchar](50) NULL, + [CreateMan] [nvarchar](50) NULL, + [CreateDate] [datetime] NULL, + CONSTRAINT [PK_Inspection_Test_Plan] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +CREATE TABLE [dbo].[Report_Construction_Plan]( + [Id] [nvarchar](50) NOT NULL, + [ReportId] [nvarchar](50) NULL, + ReType nvarchar(20) NULL, + [UnitOrMajor] [nvarchar](200) NULL, + [Quantity1] [int] NULL, + [Quantity2] [int] NULL, + [Quantity3] [int] NULL, + [Remarks] [nvarchar](200) NULL, + CONSTRAINT [PK_Report_Construction_Plan] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('A70EA41D-0B45-4753-AC77-BF28DA066402','ƻ','CQMS/Comprehensive/InspectionTestPlan.aspx',76,'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1) +go +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('0D2A8A6E-C04F-4701-9FAF-ADA6788249E0','A70EA41D-0B45-4753-AC77-BF28DA066402','',1) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('FA0CADFD-9A24-4443-A769-F817F6237BA0','A70EA41D-0B45-4753-AC77-BF28DA066402','޸',2) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('99AD6093-6E22-4AA0-A836-95E54ECCA87E','A70EA41D-0B45-4753-AC77-BF28DA066402','ɾ',3) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('4F627543-A7DD-462A-94C0-520AD0024A8E','A70EA41D-0B45-4753-AC77-BF28DA066402','',4) +go + +--һģΣʩ רԱ +ALTER TABLE Comprehensive_MajorPlanApproval +add ExpertReviewMan NVARCHAR(200) NULL; + +--ͼֽ¼ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('856D53B3-C5FB-443F-917B-39E83BE685DB','ͼֽ','CQMS/Comprehensive/ReviewDrawings.aspx',111, +'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1) +go +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('A8BDAFCC-1AAF-45DC-88C3-D526688A9818','856D53B3-C5FB-443F-917B-39E83BE685DB','',1) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('546B393D-3C81-4A1F-9290-15C64B5459D6','856D53B3-C5FB-443F-917B-39E83BE685DB','޸',2) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('EB3AB16E-CD99-47CF-884F-3647EB0860AD','856D53B3-C5FB-443F-917B-39E83BE685DB','ɾ',3) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('4050BDBD-AA20-4D38-813A-6DA4FFD528D5','856D53B3-C5FB-443F-917B-39E83BE685DB','',4) +go + +--ͼֽ +CREATE TABLE [dbo].[Comprehensive_ReviewDrawings]( + [Id] [nvarchar](50) NOT NULL, + ProjectId nvarchar(50) not null, + DraCode nvarchar(50) not null, + [CNProfessionalId] [nvarchar](50) NULL, + [ReviewDate] [datetime] NULL, + [UnitWorkId] [nvarchar](500) NULL, + [ReceiveUnits] [nvarchar](800) NULL, + [Status] [nvarchar](2) NULL, + [Remarks] [nvarchar](500) NULL, + [CreateMan] [nvarchar](50) NULL, + [CreateDate] [datetime] NULL, + CONSTRAINT [PK_Comprehensive_ReviewDrawings] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO \ No newline at end of file diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 19f431f1..913c7dd6 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -207,6 +207,7 @@ + @@ -217,6 +218,7 @@ + @@ -257,6 +259,7 @@ + diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs new file mode 100644 index 00000000..85df874f --- /dev/null +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Linq; + +namespace BLL +{ + /// + /// 检验试验计划管理 + /// + public class InspectionTestPlanService + { + public static bool Insert(Model.Inspection_Test_Plan model) + { + try + { + Funs.DB.Inspection_Test_Plan.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Update(Model.Inspection_Test_Plan model) + { + try + { + var result = Funs.DB.Inspection_Test_Plan.FirstOrDefault(a => a.Id == model.Id); + if (result != null) + { + result.UnitId = model.UnitId; + result.CNProfessionalId = model.CNProfessionalId; + result.PlanCode = model.PlanCode; + result.PlanName = model.PlanName; + result.ApprovalDate = model.ApprovalDate; + result.AuditMan = model.AuditMan; + result.ApprovalMan = model.ApprovalMan; + result.Remarks = model.Remarks; + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(List newId) + { + try + { + var result = Funs.DB.Inspection_Test_Plan.Where(a => newId.Contains(a.Id)).ToList(); + if (result.Count > 0) + { + Funs.DB.Inspection_Test_Plan.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(string newId) + { + try + { + var result = Funs.DB.Inspection_Test_Plan.Where(a => a.Id == newId).ToList(); + if (result.Count > 0) + { + Funs.DB.Inspection_Test_Plan.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static Model.Inspection_Test_Plan Detail(string newId) + { + var result = Funs.DB.Inspection_Test_Plan.FirstOrDefault(a => a.Id == newId); + return result; + } + } +} diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index 95c6f940..0e46e050 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -118,6 +118,7 @@ namespace BLL newMajorPlanApproval.CompileMan = majorPlanApproval.CompileMan; newMajorPlanApproval.CompileDate = majorPlanApproval.CompileDate; newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId; + newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan; db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval); db.SubmitChanges(); } @@ -144,6 +145,7 @@ namespace BLL newMajorPlanApproval.ImplementationDeviation = majorPlanApproval.ImplementationDeviation; newMajorPlanApproval.AttachUrl = majorPlanApproval.AttachUrl; newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId; + newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs b/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs new file mode 100644 index 00000000..33213111 --- /dev/null +++ b/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections; + +namespace BLL +{ + public class ReviewDrawingsService + { + public static bool Insert(Model.Comprehensive_ReviewDrawings model) + { + try + { + Funs.DB.Comprehensive_ReviewDrawings.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Update(Model.Comprehensive_ReviewDrawings model) + { + try + { + var result = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(a => a.Id == model.Id); + if (result != null) + { + result.CNProfessionalId = model.CNProfessionalId; + result.DraCode = model.DraCode; + result.ReviewDate = model.ReviewDate; + result.UnitWorkId = model.UnitWorkId; + result.ReceiveUnits = model.ReceiveUnits; + result.Status = model.Status; + result.Remarks = model.Remarks; + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(List newId) + { + try + { + var result = Funs.DB.Comprehensive_ReviewDrawings.Where(a => newId.Contains(a.Id)).ToList(); + if (result.Count > 0) + { + Funs.DB.Comprehensive_ReviewDrawings.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(string newId) + { + try + { + var result = Funs.DB.Comprehensive_ReviewDrawings.Where(a => a.Id == newId).ToList(); + if (result.Count > 0) + { + Funs.DB.Comprehensive_ReviewDrawings.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static Model.Comprehensive_ReviewDrawings Detail(string newId) + { + var result = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(a => a.Id == newId); + return result; + } + } +} diff --git a/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs new file mode 100644 index 00000000..48a573b3 --- /dev/null +++ b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL.CQMS.ManageReport.ReportNew +{ + /// + /// 质量施工月报施工方案及检验试验计划审批情况 + /// + public class ConstructionPlanService + { + public static bool Insert(Model.Report_Construction_Plan model) + { + try + { + Funs.DB.Report_Construction_Plan.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Update(Model.Report_Construction_Plan model) + { + try + { + var result = Funs.DB.Report_Construction_Plan.FirstOrDefault(a => a.Id == model.Id); + if (result != null) + { + result.Remarks = model.Remarks; + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(List newId) + { + try + { + var result = Funs.DB.Report_Construction_Plan.Where(a => newId.Contains(a.Id)).ToList(); + if (result.Count > 0) + { + Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static bool Delete(string newId) + { + try + { + var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId).ToList(); + if (result.Count > 0) + { + Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result); + Funs.DB.SubmitChanges(); + } + return true; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + return false; + } + } + + public static Model.Report_Construction_Plan Detail(string newId) + { + var result = Funs.DB.Report_Construction_Plan.FirstOrDefault(a => a.Id == newId); + return result; + } + } +} diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 25c7f405..d2dce73f 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3781,6 +3781,11 @@ namespace BLL /// public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3"; + /// + /// 检验试验计划管理 + /// + public const string Inspection_Test_PlanMenuId = "A70EA41D-0B45-4753-AC77-BF28DA066402"; + /// /// NCR管理 /// @@ -3816,6 +3821,11 @@ namespace BLL /// public const string DesignDrawingsMenuId = "d8de4143-b680-44cf-9a78-acd3d49a8d00"; + /// + /// 图纸会审管理 + /// + public const string ReviewDrawingsMenuId = "856D53B3-C5FB-443F-917B-39E83BE685DB"; + /// /// 工序质量控制点维护 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx new file mode 100644 index 00000000..9792a0bd --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx @@ -0,0 +1,120 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionTestPlan.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan" %> + + + + + + + 检验试验计划 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs new file mode 100644 index 00000000..d106e26f --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs @@ -0,0 +1,227 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + public partial class InspectionTestPlan : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true); + BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNPr, true); + BindGrid(); + } + } + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select C.*,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName + from Inspection_Test_Plan C + left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId + left join Base_Unit as u on u.UnitId = C.UnitId + where C.ProjectId = @ProjectId"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + strSql += " AND C.UnitId=@UnitId"; + listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue)); + } + if (drpCNPr.SelectedValue != BLL.Const._Null) + { + strSql += " AND C.CNProfessionalId=@CNProfessionalId"; + listStr.Add(new SqlParameter("@CNProfessionalId", drpCNPr.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtPlanName.Text.Trim())) + { + strSql += " AND C.PlanName like @PlanName"; + listStr.Add(new SqlParameter("@PlanName", "%" + txtPlanName.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Inspection_Test_PlanMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + this.Grid1.EnableRowDoubleClickEvent = true; + } + else + { + this.Grid1.EnableRowDoubleClickEvent = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + + #region 分页、排序 + /// + /// 分页下拉 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 分页索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询按钮 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 关闭弹出窗口 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 增加 + /// + /// 新增按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionTestPlanEdit.aspx", "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 右键编辑 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionTestPlanEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(sender, e); + } + #endregion + + #region 删除 + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var InspectionPerson = BLL.InspectionTestPlanService.Detail(rowID); + if (InspectionPerson != null) + { + BLL.InspectionTestPlanService.Delete(rowID); + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs new file mode 100644 index 00000000..67589076 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs @@ -0,0 +1,179 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class InspectionTestPlan + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar ToolSearch; + + /// + /// sdrpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList sdrpUnitId; + + /// + /// drpCNPr 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNPr; + + /// + /// txtPlanName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPlanName; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// lbtnFileUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx new file mode 100644 index 00000000..4e550250 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx @@ -0,0 +1,82 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionTestPlanEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlanEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs new file mode 100644 index 00000000..956c07f0 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs @@ -0,0 +1,177 @@ +using BLL; +using System; +using System.Linq; + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + public partial class InspectionTestPlanEdit : PageBase + { + #region 定义变量 + /// + /// 主键 + /// + public string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + + BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); + BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); + this.Id = Request.Params["Id"]; + var model = BLL.InspectionTestPlanService.Detail(this.Id); + if (model != null) + { + + this.hdAttachUrl.Text = this.Id; + if (!string.IsNullOrEmpty(model.UnitId)) + { + this.drpUnitId.SelectedValue = model.UnitId; + } + if (!string.IsNullOrEmpty(model.CNProfessionalId)) + { + this.drpCNProfessionalId.SelectedValue = model.CNProfessionalId; + } + this.txtPlanCode.Text = model.PlanCode; + this.txtPlanName.Text = model.PlanName; + + if (model.ApprovalDate != null) + { + this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", model.ApprovalDate); + } + this.txtAuditMan.Text = model.AuditMan; + this.txtApprovalMan.Text = model.ApprovalMan; + this.txtRemarks.Text = model.Remarks; + } + else + { + this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + } + } + #endregion + + #region 附件上传 + /// + /// 附件上传 + /// + /// + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InsTestPlan&menuId={1}", this.hdAttachUrl.Text, BLL.Const.Inspection_Test_PlanMenuId))); + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (drpUnitId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择报批单位！", MessageBoxIcon.Warning); + return; + } + if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + return; + } + var majorPlanApproval = new Model.Inspection_Test_Plan(); + majorPlanApproval.ProjectId = this.CurrUser.LoginProjectId; + if (this.drpUnitId.SelectedValue != BLL.Const._Null) + { + majorPlanApproval.UnitId = this.drpUnitId.SelectedValue; + } + if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + majorPlanApproval.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + } + majorPlanApproval.PlanCode = this.txtPlanCode.Text.Trim(); + majorPlanApproval.PlanName = this.txtPlanName.Text.Trim(); + + if (!string.IsNullOrEmpty(this.txtApprovalDate.Text)) + { + majorPlanApproval.ApprovalDate = Convert.ToDateTime(this.txtApprovalDate.Text); + } + majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim(); + majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim(); + majorPlanApproval.Remarks = this.txtRemarks.Text.Trim(); + + + if (string.IsNullOrEmpty(this.Id)) + { + if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + { + majorPlanApproval.Id = this.hdAttachUrl.Text; + } + else + { + majorPlanApproval.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + this.hdAttachUrl.Text = majorPlanApproval.Id; + } + majorPlanApproval.CreateMan = this.CurrUser.UserId; + majorPlanApproval.CreateDate = DateTime.Now; + BLL.InspectionTestPlanService.Insert(majorPlanApproval); + } + else + { + majorPlanApproval.Id = this.Id; + BLL.InspectionTestPlanService.Update(majorPlanApproval); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Inspection_Test_PlanMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs new file mode 100644 index 00000000..006a5798 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class InspectionTestPlanEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// drpCNProfessionalId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNProfessionalId; + + /// + /// txtPlanCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPlanCode; + + /// + /// txtPlanName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPlanName; + + /// + /// txtApprovalDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtApprovalDate; + + /// + /// txtAuditMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAuditMan; + + /// + /// txtApprovalMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtApprovalMan; + + /// + /// Label13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label13; + + /// + /// txtRemarks 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemarks; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx index 693e1215..290fa6ba 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx @@ -43,7 +43,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs index 089581da..678db0d6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtAuditMan.Text = majorPlanApproval.AuditMan; this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan; this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation; + this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan; } else { @@ -100,6 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive majorPlanApproval.PlanCode = this.txtPlanCode.Text.Trim(); majorPlanApproval.PlanName = this.txtPlanName.Text.Trim(); majorPlanApproval.ReviewMan = this.txtReviewMan.Text.Trim(); + majorPlanApproval.ExpertReviewMan = this.txtExpertReviewMan.Text.Trim(); if (!string.IsNullOrEmpty(this.txtApprovalDate.Text)) { majorPlanApproval.ApprovalDate = Convert.ToDateTime(this.txtApprovalDate.Text); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs index 28996232..e0027020 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class MajorPlanApprovalEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class MajorPlanApprovalEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// drpCNProfessionalId 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorkIds 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtPlanCode 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanCode; - + /// /// txtPlanName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanName; - + /// /// txtReviewMan 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtReviewMan; - + /// /// txtApprovalDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtApprovalDate; - + /// /// txtAuditMan 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAuditMan; - + /// /// txtApprovalMan 控件。 /// @@ -119,16 +121,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApprovalMan; - + /// - /// Label13 控件。 + /// txtExpertReviewMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label13; - + protected global::FineUIPro.TextBox txtExpertReviewMan; + /// /// txtImplementationDeviation 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtImplementationDeviation; - + /// /// Panel2 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// Toolbar1 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx new file mode 100644 index 00000000..b7a3c06b --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx @@ -0,0 +1,131 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReviewDrawings.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings" %> + + + + + + + 图纸会审管理 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs new file mode 100644 index 00000000..30c1fbc6 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs @@ -0,0 +1,315 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + public partial class ReviewDrawings : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true); + BindGrid(); + } + } + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"SELECT C.*,CN.ProfessionalName" + + @" FROM Comprehensive_ReviewDrawings C " + + @" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId" + + @" WHERE C.ProjectId = @ProjectId"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + + if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + strSql += " AND C.CNProfessionalId=@CNProfessionalId"; + listStr.Add(new SqlParameter("@CNProfessionalId", sdrpCNProfessionalId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtDraCode.Text.Trim())) + { + strSql += " AND C.DraCode='" + txtDraCode.Text.Trim() + "'"; + + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ReviewDrawingsMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + this.Grid1.EnableRowDoubleClickEvent = true; + } + else + { + this.Grid1.EnableRowDoubleClickEvent = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnSave)) + { + //this.btnImport.Hidden = false; + } + } + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 分页、排序 + /// + /// 分页下拉 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 新增 + /// + /// 新增按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReviewDrawingsEdit.aspx", "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 右键修改 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReviewDrawingsEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.btnMenuModify_Click(sender, e); + } + #endregion + + #region 删除 + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var InspectionPerson = BLL.ReviewDrawingsService.Detail(rowID); + if (InspectionPerson != null) + { + BLL.ReviewDrawingsService.Delete(rowID); + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 关闭弹出窗口 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 格式化字符串 + /// + /// 获取单位工程名称 + /// + /// + /// + protected string ConvertUnitWork(object CarryUnitWorks) + { + string CarryUnitWorkName = string.Empty; + if (CarryUnitWorks != null) + { + string[] Ids = CarryUnitWorks.ToString().Split(','); + foreach (string t in Ids) + { + var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t); + if (UnitWork != null) + { + CarryUnitWorkName += UnitWork.UnitWorkName + ","; + } + } + } + if (CarryUnitWorkName != string.Empty) + { + return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1); + } + else + { + return ""; + } + } + + /// + /// 获取单位名称 + /// + /// + /// + protected string ConvertCarryUnit(object CarryUnitIds) + { + string CarryUnitName = string.Empty; + if (CarryUnitIds != null) + { + string[] Ids = CarryUnitIds.ToString().Split(','); + foreach (string t in Ids) + { + var type = BLL.UnitService.GetUnitByUnitId(t); + if (type != null) + { + CarryUnitName += type.UnitName + ","; + } + } + } + if (CarryUnitName != string.Empty) + { + return CarryUnitName.Substring(0, CarryUnitName.Length - 1); + } + else + { + return ""; + } + } + #endregion + + public static string ConvertState(object Status) + { + if (Status != null) + { + if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) + { + return "重报"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) + { + return "驳回"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) + { + return "编制"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) + { + return "待审批"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) + { + return "审批完成"; + } + } + + return "编制"; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs new file mode 100644 index 00000000..27acdd82 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs @@ -0,0 +1,215 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class ReviewDrawings + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar ToolSearch; + + /// + /// sdrpCNProfessionalId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList sdrpCNProfessionalId; + + /// + /// txtDraCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDraCode; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// txtStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label txtStatus; + + /// + /// lbtnFileUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx new file mode 100644 index 00000000..ae1e621e --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx @@ -0,0 +1,107 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReviewDrawingsEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.ReviewDrawingsEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs new file mode 100644 index 00000000..85226e42 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -0,0 +1,482 @@ +using BLL; +using BLL.CQMS.Comprehensive; +using System; +using System.Linq; + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + public partial class ReviewDrawingsEdit : PageBase + { + #region 定义变量 + /// + /// 主键 + /// + public string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); + BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false); + BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false); + LoadAuditSelect(); + this.agree.Hidden = true; + this.options.Hidden = true; + + this.btnSave.Hidden = true; + this.btnSubmit.Hidden = true; + this.Id = Request.Params["Id"]; + var model = BLL.ReviewDrawingsService.Detail(this.Id); + if (model != null) + { + this.Id = model.Id; + this.hdAttachUrl.Text = this.Id; + if (!string.IsNullOrEmpty(model.CNProfessionalId)) + { + this.drpCNProfessionalId.SelectedValue = model.CNProfessionalId; + } + if (!string.IsNullOrEmpty(model.UnitWorkId)) + { + this.drpUnitWorkIds.SelectedValueArray = model.UnitWorkId.Split(','); + } + this.txtDraCode.Text = model.DraCode; + + this.txtReviewDate.Text = model.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReviewDate) : ""; + + if (!string.IsNullOrEmpty(model.ReceiveUnits)) + { + this.drpUnitIds.SelectedValueArray = model.ReceiveUnits.Split(','); + } + this.txtRemarks.Text = model.Remarks; + + + var currApprove = DesignDrawingsApproveService.GetCurrentApprove(model.Id); + if (currApprove != null) + { //重新编制 编制人 可以 显示 提交 保存按钮 + + this.drpAudit.SelectedValue = currApprove.ApproveMan; + if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && model.CreateMan == CurrUser.UserId) + { + this.btnSubmit.Hidden = false; + this.btnSave.Hidden = false; + }//审核状态 审核人 可以显示 提交 保存按钮 + else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId) + { + //审核状态不可编辑 + Readonly(); + this.agree.Hidden = false; + this.options.Hidden = false; + this.btnSubmit.Hidden = false; + this.btnSave.Hidden = false; + } + }//没有当前审核人，已完成状态 或者 待提交状态 + else + { + if (model.Status == BLL.Const.Comprehensive_Compile && model.CreateMan == CurrUser.UserId) + { + this.btnSubmit.Hidden = false; + this.btnSave.Hidden = false; + } + } + } + else + { + this.btnSave.Hidden = false; + this.btnSubmit.Hidden = false; + } + } + } + + + + + /// + /// 禁止编辑 + /// + public void Readonly() + { + this.txtDraCode.Readonly = true; + this.txtReviewDate.Readonly = true; + this.drpCNProfessionalId.Readonly = true; + this.drpUnitWorkIds.Readonly = true; + this.drpUnitIds.Readonly = true; + this.txtRemarks.Readonly = true; + this.txtReviewDate.Readonly = true; + this.drpAudit.Readonly = true; + //this.btnAttach.Enabled = false; + + } + + /// + /// 加载专业工程师 + /// + public void LoadAuditSelect() + { + + var db = Funs.DB; + var userList = from x in db.Sys_User + join y in db.Project_ProjectUnit + on x.UnitId equals y.UnitId + join p in db.Project_ProjectUser + on x.UserId equals p.UserId + where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where p.RoleId.Contains(Const.ZBCNEngineer) + select new { UserId = x.UserId, UserName = x.UserName }; + drpAudit.DataValueField = "UserId"; + drpAudit.DataTextField = "UserName"; + this.drpAudit.DataSource = userList.ToList(); + this.drpAudit.DataBind(); + } + + + + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ReviewDrawingsMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + + #region 附件上传 + /// + /// 附件上传 + /// + /// + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); + } + Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.Id); + if (designDrawings == null || ((designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_Compile) || (designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_ReCompile))) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId))); + } + else + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId))); + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + + if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + return; + } + + var designDrawings = new Model.Comprehensive_ReviewDrawings(); + designDrawings.ProjectId = this.CurrUser.LoginProjectId; + designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + designDrawings.DraCode = this.txtDraCode.Text.Trim(); + designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); + designDrawings.Remarks = this.txtRemarks.Text.Trim(); + designDrawings.CreateMan = this.CurrUser.UserId; + designDrawings.CreateDate = DateTime.Now; + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // designDrawings.AuditMan = drpAudit.SelectedValue; + //} //审核人 + string ids = string.Empty; + var lists = this.drpUnitWorkIds.SelectedValueArray; + foreach (var item in lists) + { + ids += item + ","; + } + if (!string.IsNullOrEmpty(ids)) + { + ids = ids.Substring(0, ids.LastIndexOf(",")); + } + designDrawings.UnitWorkId = ids; + + string unitIds = string.Empty; + var unitLists = this.drpUnitIds.SelectedValueArray; + foreach (var item in unitLists) + { + unitIds += item + ","; + } + if (!string.IsNullOrEmpty(unitIds)) + { + unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + } + designDrawings.ReceiveUnits = unitIds; + if (!string.IsNullOrEmpty(this.Id)) + { + designDrawings.Id = this.Id; + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} + + var model = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); + if (model != null) + { + + designDrawings.Status = model.Status; + } + BLL.ReviewDrawingsService.Update(designDrawings); + } + else + { + if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + { + designDrawings.Id = this.hdAttachUrl.Text; + } + else + { + designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); + this.hdAttachUrl.Text = designDrawings.Id; + } + + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} + designDrawings.Status = BLL.Const.Comprehensive_Compile; + BLL.ReviewDrawingsService.Insert(designDrawings); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + + } + + + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + return; + } + var designDrawings = new Model.Comprehensive_ReviewDrawings(); + designDrawings.ProjectId = this.CurrUser.LoginProjectId; + designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + designDrawings.DraCode = this.txtDraCode.Text.Trim(); + designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); + designDrawings.Remarks = this.txtRemarks.Text.Trim(); + designDrawings.CreateMan = this.CurrUser.UserId; + designDrawings.CreateDate = DateTime.Now; + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // designDrawings.AuditMan = drpAudit.SelectedValue; + //} //审核人 + string ids = string.Empty; + var lists = this.drpUnitWorkIds.SelectedValueArray; + foreach (var item in lists) + { + ids += item + ","; + } + if (!string.IsNullOrEmpty(ids)) + { + ids = ids.Substring(0, ids.LastIndexOf(",")); + } + designDrawings.UnitWorkId = ids; + + string unitIds = string.Empty; + var unitLists = this.drpUnitIds.SelectedValueArray; + foreach (var item in unitLists) + { + unitIds += item + ","; + } + if (!string.IsNullOrEmpty(unitIds)) + { + unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + } + designDrawings.ReceiveUnits = unitIds; + if (!string.IsNullOrEmpty(this.Id)) + { + designDrawings.Id = this.Id; + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} + //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); + var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); + if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + { + designDrawings.CreateMan = this.CurrUser.UserId; + designDrawings.Status = BLL.Const.Comprehensive_Audit; + BLL.ReviewDrawingsService.Insert(designDrawings); + } + else + { + + if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + { + designDrawings.Status = BLL.Const.Comprehensive_Audit; + } + else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + { + designDrawings.Status = BLL.Const.Comprehensive_Audit; + } + else //审核状态 提交 变 完成 或者 重新编制 + { + if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + { + designDrawings.Status = BLL.Const.Comprehensive_Complete; + } + else + { + designDrawings.Status = BLL.Const.Comprehensive_ReCompile; + } + } + + BLL.ReviewDrawingsService.Update(designDrawings); + + } + } + else + { + if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + { + designDrawings.Id = this.hdAttachUrl.Text; + } + else + { + designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); + this.hdAttachUrl.Text = designDrawings.Id; + } + + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} + designDrawings.Status = BLL.Const.Comprehensive_Audit; + BLL.ReviewDrawingsService.Insert(designDrawings); + } + + + + + + #region 审核记录 + + var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.Id); + if (currApprove == null) //为获取到为 当前编制状态 直接提交 + { + var approve = new Model.Comprehensive_DesignDrawingsApprove(); + approve.DesignDrawingsId = designDrawings.Id; + approve.ApproveMan = this.CurrUser.UserId; + approve.ApproveType = Const.Comprehensive_Compile; + approve.ApproveDate = DateTime.Now; + DesignDrawingsApproveService.EditApprove(approve); //新增编制记录 + + + Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + newApprove.DesignDrawingsId = designDrawings.Id; + newApprove.ApproveMan = this.drpAudit.SelectedValue; + newApprove.ApproveType = Const.InspectionManagement_Audit; + DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + + } + else if (currApprove.ApproveMan == CurrUser.UserId) + { + if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + { + currApprove.ApproveDate = DateTime.Now; + //currApprove.IsAgree = true; + DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + newApprove.DesignDrawingsId = designDrawings.Id; + newApprove.ApproveMan = this.drpAudit.SelectedValue; + newApprove.ApproveType = Const.InspectionManagement_Audit; + DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + } + else + { + currApprove.ApproveDate = DateTime.Now; //更新审核时间 + currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + currApprove.ApproveIdea = this.txtidea.Text; + DesignDrawingsApproveService.EditApprove(currApprove); + + if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + { + Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + reApprove.ApproveMan = CurrUser.UserId; + reApprove.ApproveType = Const.Comprehensive_Complete; + // reApprove.ApproveIdea = txtidea.Text; + DesignDrawingsApproveService.EditApprove(reApprove); + } + else + { + Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + reApprove.ApproveMan = designDrawings.CreateMan; + reApprove.ApproveType = Const.Comprehensive_ReCompile; + DesignDrawingsApproveService.EditApprove(reApprove); + } + } + } + + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + + #endregion + + + + } + + /// + /// 保存方法 + /// + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs new file mode 100644 index 00000000..63a5870b --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs @@ -0,0 +1,215 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class ReviewDrawingsEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// drpCNProfessionalId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNProfessionalId; + + /// + /// drpUnitWorkIds 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkIds; + + /// + /// txtDraCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDraCode; + + /// + /// txtReviewDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReviewDate; + + /// + /// drpUnitIds 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitIds; + + /// + /// txtRemarks 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemarks; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// drpAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpAudit; + + /// + /// agree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow agree; + + /// + /// rblIsAgree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsAgree; + + /// + /// options 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow options; + + /// + /// txtidea 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtidea; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx index aa9993bd..d29af678 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx @@ -15,7 +15,8 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index 20d19bfd..52454509 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -66,6 +66,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew return date; } + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportEdit.aspx?reportId=" + Grid1.SelectedRowID, "添加 - "))); + } + + protected void btnNew_Click(object sender, EventArgs e) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportEdit.aspx", "添加 - "))); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index 2e9a68c0..5bb7dca6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -8,24 +8,29 @@ 编辑施工质量周报(新) - + - +
@@ -95,13 +100,22 @@ 时间段  - + + + + + + + <%-- — + OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged">--%> @@ -131,87 +145,84 @@ --%> - - - <%--1.本月质量目标管理情况--%> - - - - - - + + + + + + - - - - - - - - - + + + + <%--2.本月主要工作内容--%> @@ -219,13 +230,13 @@ ShowHeader="true"> + ShowHeader="true"> - @@ -233,16 +244,16 @@ - + + ShowHeader="true"> - @@ -250,16 +261,16 @@ - + + ShowHeader="true"> - @@ -267,87 +278,376 @@ - - + + - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--4.设计交底管理情况--%> + + + + + + + + + - <%--20.项目质量体系审核--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--5.图纸会审管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--6.设计变更管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--20.项目质量体系审核--%> - - - - - - - - - - - + + + + + + + + + + + <%--21.类似项目管理经验教训应对措施及跟踪--%> - - - - - - - - - - - + + + + + + + + + + + <%--22.附件--%> - - - - - - - - - - - - + + + + + + + + + + + @@ -359,7 +659,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 770ed477..1d2e026f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -98,6 +98,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion + #region 加载文本框内容 var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList(); txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText; @@ -108,7 +109,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText; txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText; #endregion - + //加载所有grid + lodAllGrid("1"); } else @@ -118,10 +120,37 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //给个新的主键 ReportId = Guid.NewGuid().ToString(); AddOrUpdate = "add"; + + //加载所有grid + lodAllGrid("0"); } hidReportId.Value = ReportId; } } + + /// + /// 加载grid + /// + /// + void lodAllGrid(string objType) { + //加载一般施工方案审批情况 + loadGeneralPlanApproval(objType); + + //加载危大工程方案审批情况 + loadMajorPlanApproval(objType); + + //质量控制点或检验试验计划（ITP）情况 + loadInspectionTestPlan(objType); + + //加载设计交底管理情况 + loadDesignDetailsApprove(objType); + + //加载图纸会审管理情况 + loadReviewDrawings(objType); + + //加载设计变更管理情况 + loadDesignChangeOrder(); + } #endregion #region 时间选择事件 @@ -142,6 +171,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text); } } + + protected void TextBox_TextChanged(object sender, EventArgs e) { + if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())&& !string.IsNullOrEmpty(this.txtEndDate.Text.Trim())) { + + if (Funs.GetNewDateTime(this.txtStartDate.Text.Trim()) > Funs.GetNewDateTime(this.txtEndDate.Text.Trim())) + { + Alert.ShowInTop("开始时间不能大于结束时间！", MessageBoxIcon.Warning); + return; + } + if (AddOrUpdate == "update") + { + lodAllGrid("1"); + } + else { + lodAllGrid("0"); + } + } + } #endregion #region 本月质量目标管理情况 Grid1方法 @@ -188,6 +235,490 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } #endregion + #region 3.1一般施工方案审批情况 Grid2方法 + /// + /// 加载一般施工审批情况 + /// + void loadGeneralPlanApproval(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2|| x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + + var query = from c in db.Comprehensive_GeneralPlanApproval + + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + + from u in unitJoin.DefaultIfEmpty() + + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + + { + c.ApprovalDate, + c.ProjectId, + u.UnitId, + u.UnitName, + c.CompileDate + }; + + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ApprovalDate >= Convert.ToDateTime(startDate) && x.ApprovalDate <= Convert.ToDateTime(endDate))); + + Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); + + model.Id = Guid.NewGuid().ToString(); + model.UnitOrMajor = item.UnitName; + model.Quantity1 = monethCount.Count(); + model.Quantity2 = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType=="1") + { + var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.UnitName && x.ReType == "0"); + if (NewModel!=null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum+= monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + Grid2.DataSource = list; + Grid2.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Sum.ToString()); + summary.Add("Quantity2", Quantity2Sum.ToString()); + + Grid2.SummaryData = summary; + } + + + #endregion + + #region 3.2 危大工程方案审批情况 Grid3方法 + /// + /// 加载一般施工审批情况 + /// + void loadMajorPlanApproval(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + int Quantity3Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + + var query = from c in db.Comprehensive_MajorPlanApproval + + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + + from u in unitJoin.DefaultIfEmpty() + + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + + { + c.ApprovalDate, + c.ProjectId, + u.UnitId, + u.UnitName, + c.ExpertReviewMan, + c.CompileDate + }; + + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ApprovalDate >= Convert.ToDateTime(startDate) && x.ApprovalDate <= Convert.ToDateTime(endDate))); + + Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); + + model.Id = Guid.NewGuid().ToString(); + model.UnitOrMajor = item.UnitName; + model.Quantity1 = monethCount.Count(); + model.Quantity2 = AllList.Count(); + model.Quantity3 = AllList.Where(x => x.ExpertReviewMan != "").ToList().Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.UnitName && x.ReType == "1"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + Quantity3Sum += Convert.ToInt32(model.Quantity3); + i++; + } + Grid3.DataSource = list; + Grid3.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Sum.ToString()); + summary.Add("Quantity2", Quantity2Sum.ToString()); + summary.Add("Quantity3", Quantity3Sum.ToString()); + Grid3.SummaryData = summary; + } + + + #endregion + + #region 3.3 质量控制点或检验试验计划（ITP）情况 Grid4方法 + /// + /// 加载一般施工审批情况 + /// + void loadInspectionTestPlan(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有专业 + var CNProfessionals = from x in Funs.DB.Base_CNProfessional + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + orderby x.SortIndex + select new + { + x.CNProfessionalId, + x.ProfessionalName + }; + + + foreach (var item in CNProfessionals) + { + + var query = from c in db.Inspection_Test_Plan + + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + + from u in unitJoin.DefaultIfEmpty() + + where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId + select new + + { + c.ApprovalDate, + c.ProjectId, + u.UnitId, + u.UnitName, + c.CreateDate + }; + + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CreateDate >= Convert.ToDateTime(startDate) && x.CreateDate <= Convert.ToDateTime(endDate))); + + Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); + + model.Id = Guid.NewGuid().ToString(); + model.UnitOrMajor = item.ProfessionalName; + model.Quantity1 = monethCount.Count(); + model.Quantity2 = AllList.Count(); + + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "2"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + + i++; + } + Grid4.DataSource = list; + Grid4.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Sum.ToString()); + summary.Add("Quantity2", Quantity2Sum.ToString()); + Grid4.SummaryData = summary; + } + + + #endregion + + #region 4 设计交底管理情况 Grid5方法 + /// + /// 加载一般施工审批情况 + /// + void loadDesignDetailsApprove(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有专业 + var CNProfessionals = from x in Funs.DB.Base_CNProfessional + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + orderby x.SortIndex + select new + { + x.CNProfessionalId, + x.ProfessionalName + }; + + + foreach (var item in CNProfessionals) + { + + var query = from c in db.Comprehensive_DesignDetails + + where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId + && c.Status=="3" + select new + + { + c.Status, + c.CompileDate, + c.ProjectId, + + }; + + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate))); + + Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); + + model.Id = Guid.NewGuid().ToString(); + model.UnitOrMajor = item.ProfessionalName; + model.Quantity1 = monethCount.Count(); + model.Quantity2 = AllList.Count(); + + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "3"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + + i++; + } + Grid5.DataSource = list; + Grid5.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Sum.ToString()); + summary.Add("Quantity2", Quantity2Sum.ToString()); + Grid5.SummaryData = summary; + } + + + #endregion + + #region 5 图纸会审管理情况 Grid6方法 + /// + /// 加载一图纸会审管理情况 + /// + void loadReviewDrawings(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有专业 + var CNProfessionals = from x in Funs.DB.Base_CNProfessional + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + orderby x.SortIndex + select new + { + x.CNProfessionalId, + x.ProfessionalName + }; + + + foreach (var item in CNProfessionals) + { + + var query = from c in db.Comprehensive_ReviewDrawings + + where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId + && c.Status == "3" + select new + + { + c.Status, + c.ReviewDate, + c.ProjectId, + + }; + + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReviewDate >= Convert.ToDateTime(startDate) && x.ReviewDate <= Convert.ToDateTime(endDate))); + + Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); + + model.Id = Guid.NewGuid().ToString(); + model.UnitOrMajor = item.ProfessionalName; + model.Quantity1 = monethCount.Count(); + model.Quantity2 = AllList.Count(); + + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "4"); + if (NewModel != null) + { + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + + i++; + } + Grid6.DataSource = list; + Grid6.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Sum.ToString()); + summary.Add("Quantity2", Quantity2Sum.ToString()); + Grid6.SummaryData = summary; + } + + + #endregion + + #region 6 设计变更管理情况 Grid7方法 + /// + /// 加载设计变更管理情况 + /// + void loadDesignChangeOrder() + { + int Quantity1Sum=0, Quantity2Sum=0, Quantity3Sum=0, Quantity4Sum=0, Quantity5Sum=0, Quantity6Sum = 0; + + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + DateTime projectStartDate = Convert.ToDateTime("2015-01-01"); + List StatisticsList = new List(); + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (project != null) + { + if (project.StartDate != null) + { + projectStartDate = Convert.ToDateTime(project.StartDate); + } + } + int i = 1; + var cNProfessionals = from x in Funs.DB.Base_CNProfessional orderby x.SortIndex select x; + foreach (var item in cNProfessionals) + { + //专业下所有集合 + List totalManagementList = BLL.DesignChangeOrderService.GetDesignChangeOrderListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, item.CNProfessionalId, projectStartDate, DateTime.Now); + //专业下当期集合 + List managementList = BLL.DesignChangeOrderService.GetDesignChangeOrderListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, item.CNProfessionalId, startDate, endDate); + Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); + checkStatisc.Num = i; + checkStatisc.WorkName = item.ProfessionalName; + checkStatisc.CheckNum = managementList.Count(); + checkStatisc.TotalCheckNum = totalManagementList.Count(); + checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null); + checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null); + checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString(); //当期完成数 + checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString(); //累计完成数 + + StatisticsList.Add(checkStatisc); + Quantity1Sum += checkStatisc.CheckNum; + Quantity2Sum += checkStatisc.TotalCheckNum; + Quantity3Sum+= checkStatisc.OKNum; + Quantity4Sum += checkStatisc.TotalOKNum; + Quantity5Sum += Convert.ToInt32(checkStatisc.OneOKRate); + Quantity6Sum += Convert.ToInt32(checkStatisc.TotalOneOKRate); + } + + Grid7.DataSource = StatisticsList; + Grid7.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + summary.Add("CheckNum", Quantity1Sum.ToString()); + summary.Add("TotalCheckNum", Quantity2Sum.ToString()); + summary.Add("OKNum", Quantity3Sum.ToString()); + summary.Add("TotalOKNum", Quantity4Sum.ToString()); + summary.Add("OneOKRate", Quantity5Sum.ToString()); + summary.Add("TotalOneOKRate", Quantity6Sum.ToString()); + Grid7.SummaryData = summary; + } + + + #endregion + #region 保存 /// /// 保存按钮 @@ -228,12 +759,30 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //所有文本框表 TextBoxContentService.Delete(ReportId); + + //删除施工方案及检验试验计划审批情况 + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); #endregion #region 保存所有子表 //保存本月质量目标管理情况 saveTarget(); + //保存3.1一般施工方案审批情况 + saveYbsgfa(); + + //保存3.2危大工程方案审批情况 + saveWdgcfa(); + + //保存3.2质量控制点或检验试验计划（ITP）情况 + saveJysyjh(); + + //保存4 设计交底管理情况 + saveSjjd(); + + //保存4图纸会审管理情况 + saveTzhs(); + //保存文本框 saveTxtContent(); #endregion @@ -284,6 +833,172 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } #endregion + /// + /// 3.1保存一般施工方案审批情况 + /// + void saveYbsgfa() { + List detailLists = new List(); + JArray teamGroupData = Grid2.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan + { + //Id = values.Value("Id"), + ReportId = ReportId, + ReType = "0", + UnitOrMajor = values.Value("UnitOrMajor"), + Quantity1 = values.Value("Quantity1"), + Quantity2 = values.Value("Quantity2"), + Remarks = values.Value("Remarks") + }; + if (Grid2.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 3.2保存危大工程方案审批情况 + /// + void saveWdgcfa() { + List detailLists = new List(); + JArray teamGroupData = Grid3.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan + { + //Id = values.Value("Id"), + ReportId = ReportId, + ReType = "1", + UnitOrMajor = values.Value("UnitOrMajor"), + Quantity1 = values.Value("Quantity1"), + Quantity2 = values.Value("Quantity2"), + Quantity3 = values.Value("Quantity3"), + Remarks = values.Value("Remarks") + }; + if (Grid3.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 3.3 质量控制点或检验试验计划（ITP）情况 + /// + void saveJysyjh() { + List detailLists = new List(); + JArray teamGroupData = Grid4.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan + { + //Id = values.Value("Id"), + ReportId = ReportId, + ReType = "2", + UnitOrMajor = values.Value("UnitOrMajor"), + Quantity1 = values.Value("Quantity1"), + Quantity2 = values.Value("Quantity2"), + Remarks = values.Value("Remarks") + }; + if (Grid4.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 保存设计交底管理情况 + /// + void saveSjjd() { + List detailLists = new List(); + JArray teamGroupData = Grid5.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan + { + //Id = values.Value("Id"), + ReportId = ReportId, + ReType = "3", + UnitOrMajor = values.Value("UnitOrMajor"), + Quantity1 = values.Value("Quantity1"), + Quantity2 = values.Value("Quantity2"), + Remarks = values.Value("Remarks") + }; + if (Grid5.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 保存图纸会审 + /// + void saveTzhs() { + List detailLists = new List(); + JArray teamGroupData = Grid6.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan + { + //Id = values.Value("Id"), + ReportId = ReportId, + ReType = "4", + UnitOrMajor = values.Value("UnitOrMajor"), + Quantity1 = values.Value("Quantity1"), + Quantity2 = values.Value("Quantity2"), + Remarks = values.Value("Remarks") + }; + if (Grid6.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + /// /// 保存文本框内容 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs index 290b4f10..8a3ad5fd 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs @@ -156,7 +156,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.TextBox txtStartDate; + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; /// /// txtEndDate 控件。 @@ -165,7 +174,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.TextBox txtEndDate; + protected global::FineUIPro.DatePicker txtEndDate; /// /// Panel4 控件。 @@ -374,6 +383,195 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected global::FineUIPro.Form Form9; + /// + /// Grid2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// TextBox5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox5; + + /// + /// Panel11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel11; + + /// + /// Form10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form10; + + /// + /// Grid3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid3; + + /// + /// TextBox1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox1; + + /// + /// Panel12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel12; + + /// + /// Form11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form11; + + /// + /// Grid4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid4; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + + /// + /// Panel13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel13; + + /// + /// Form12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form12; + + /// + /// Grid5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid5; + + /// + /// TextBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox3; + + /// + /// Panel14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel14; + + /// + /// Form13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form13; + + /// + /// Grid6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid6; + + /// + /// TextBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox4; + + /// + /// Panel15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel15; + + /// + /// Form14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form14; + + /// + /// Grid7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid7; + /// /// Panel3 控件。 /// diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index ad86a6bf..659d92e2 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -3009,3 +3009,169 @@ IP地址:::1 出错时间:03/12/2024 14:53:51 + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))select C.*,CN.ProfessionalName,C.CNPr' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionTestPlan.aspx.cs:行号 57 + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionTestPlan.aspx.cs:行号 25 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/18/2024 17:30:10 +出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionTestPlan.aspx +IP地址:::1 +操作人员:JT + +出错时间:03/18/2024 17:30:10 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))select QualityAccidentId, time, Place' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.Comprehensive.QualityAccident.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\QualityAccident.aspx.cs:行号 41 + 在 FineUIPro.Web.Comprehensive.QualityAccident.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\QualityAccident.aspx.cs:行号 23 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/18/2024 18:09:49 +出错文件:http://localhost:8579/CQMS/Comprehensive/QualityAccident.aspx +IP地址:::1 +操作人员:JT + +出错时间:03/18/2024 18:09:49 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\ReviewDrawings.aspx(32): error CS1061: “ASP.cqms_comprehensive_reviewdrawings_aspx”不包含“btnImport_Click”的定义，并且找不到可接受类型为“ASP.cqms_comprehensive_reviewdrawings_aspx”的第一个参数的扩展方法“btnImport_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:03/19/2024 09:34:00 +出错文件:http://localhost:8579/CQMS/Comprehensive/ReviewDrawings.aspx +IP地址:::1 + +出错时间:03/19/2024 09:34:00 + + +错误信息开始=====> +错误类型:HttpException +错误信息:DataBinding:“System.Data.DataRowView”不包含名为“DesignDrawingsId”的属性。 +错误堆栈: + 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName) + 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts) + 在 System.Web.UI.DataBinder.Eval(Object container, String expression) + 在 System.Web.UI.TemplateControl.Eval(String expression) + 在 ASP.cqms_comprehensive_reviewdrawings_aspx.__DataBindinglbtnFileUrl(Object sender, EventArgs e) 位置 e:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\ReviewDrawings.aspx:行号 78 + 在 System.Web.UI.Control.OnDataBinding(EventArgs e) + 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding) + 在 System.Web.UI.Control.DataBind() + 在 System.Web.UI.Control.DataBindChildren() + 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding) + 在 System.Web.UI.Control.DataBind() + 在 (Control ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.BCddVmyfIadUytlhvgnchfKxYmAe(DataTable , Boolean ) + 在 (Grid , DataTable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings.BindGrid() + 在 FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings.Window1_Close(Object sender, WindowCloseEventArgs e) + 在 FineUIPro.Window.OnClose(WindowCloseEventArgs e) + 在 (Window , WindowCloseEventArgs ) + 在 FineUIPro.Window.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) +出错时间:03/19/2024 09:35:59 +出错文件:http://localhost:8579/CQMS/Comprehensive/ReviewDrawings.aspx +IP地址:::1 +操作人员:JT + +出错时间:03/19/2024 09:35:59 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 (Object ) + 在 FineUIPro.GridRow.uwEUVXJIBfEGVvHqMvTlecFpBACr() + 在 (GridRow ) + 在 FineUIPro.GridRow.InitTemplateContainers() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.loadDesignChangeOrder() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 705 + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.lodAllGrid(String objType) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 152 + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 113 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/19/2024 10:40:05 +出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReportEdit.aspx?reportId=40d1c54d-ba0b-468d-a9a7-270797565e1b +IP地址:::1 +操作人员:JT + +出错时间:03/19/2024 10:40:05 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d90d41b8..b9a971a9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -449,6 +449,8 @@ + + @@ -462,6 +464,8 @@ + + @@ -7456,6 +7460,20 @@ InspectionPersonEdit.aspx + + InspectionTestPlan.aspx + ASPXCodeBehind + + + InspectionTestPlan.aspx + + + InspectionTestPlanEdit.aspx + ASPXCodeBehind + + + InspectionTestPlanEdit.aspx + MajorPlanApproval.aspx ASPXCodeBehind @@ -7547,6 +7565,20 @@ QualityAccidentEdit.aspx + + ReviewDrawings.aspx + ASPXCodeBehind + + + ReviewDrawings.aspx + + + ReviewDrawingsEdit.aspx + ASPXCodeBehind + + + ReviewDrawingsEdit.aspx + SiteVisaManagement.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index d8c81922..90a0f30f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -13,6 +13,7 @@ + @@ -20,6 +21,7 @@ + diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index 8a497c41..ac8364da 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -7,6 +7,4 @@ - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 533bee11..cc7e0f27 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -84,6 +84,5 @@ - \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ba1e2196..39e735c5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -593,6 +593,9 @@ namespace Model partial void InsertComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance); partial void UpdateComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance); partial void DeleteComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance); + partial void InsertComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance); + partial void UpdateComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance); + partial void DeleteComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance); partial void InsertComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance); partial void UpdateComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance); partial void DeleteComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance); @@ -1256,6 +1259,9 @@ namespace Model partial void InsertInspection_SummaryMb(Inspection_SummaryMb instance); partial void UpdateInspection_SummaryMb(Inspection_SummaryMb instance); partial void DeleteInspection_SummaryMb(Inspection_SummaryMb instance); + partial void InsertInspection_Test_Plan(Inspection_Test_Plan instance); + partial void UpdateInspection_Test_Plan(Inspection_Test_Plan instance); + partial void DeleteInspection_Test_Plan(Inspection_Test_Plan instance); partial void InsertInterFaceLog(InterFaceLog instance); partial void UpdateInterFaceLog(InterFaceLog instance); partial void DeleteInterFaceLog(InterFaceLog instance); @@ -1952,6 +1958,9 @@ namespace Model partial void InsertReport_Comprehensive(Report_Comprehensive instance); partial void UpdateReport_Comprehensive(Report_Comprehensive instance); partial void DeleteReport_Comprehensive(Report_Comprehensive instance); + partial void InsertReport_Construction_Plan(Report_Construction_Plan instance); + partial void UpdateReport_Construction_Plan(Report_Construction_Plan instance); + partial void DeleteReport_Construction_Plan(Report_Construction_Plan instance); partial void InsertReport_ConstructionProblems(Report_ConstructionProblems instance); partial void UpdateReport_ConstructionProblems(Report_ConstructionProblems instance); partial void DeleteReport_ConstructionProblems(Report_ConstructionProblems instance); @@ -4103,6 +4112,14 @@ namespace Model } } + public System.Data.Linq.Table Comprehensive_ReviewDrawings + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Comprehensive_SiteVisaManagement { get @@ -5879,6 +5896,14 @@ namespace Model } } + public System.Data.Linq.Table Inspection_Test_Plan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table InterFaceLog { get @@ -7735,6 +7760,14 @@ namespace Model } } + public System.Data.Linq.Table Report_Construction_Plan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_ConstructionProblems { get @@ -95033,6 +95066,8 @@ namespace Model private string _UnitWorkId; + private string _ExpertReviewMan; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -95075,6 +95110,8 @@ namespace Model partial void OnCompileDateChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); + partial void OnExpertReviewManChanging(string value); + partial void OnExpertReviewManChanged(); #endregion public Comprehensive_MajorPlanApproval() @@ -95398,6 +95435,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExpertReviewMan", DbType="NVarChar(200)")] + public string ExpertReviewMan + { + get + { + return this._ExpertReviewMan; + } + set + { + if ((this._ExpertReviewMan != value)) + { + this.OnExpertReviewManChanging(value); + this.SendPropertyChanging(); + this._ExpertReviewMan = value; + this.SendPropertyChanged("ExpertReviewMan"); + this.OnExpertReviewManChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_MajorPlanApproval_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -98200,6 +98257,308 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Comprehensive_ReviewDrawings")] + public partial class Comprehensive_ReviewDrawings : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _CNProfessionalId; + + private string _DraCode; + + private System.Nullable _ReviewDate; + + private string _UnitWorkId; + + private string _ReceiveUnits; + + private string _Status; + + private string _Remarks; + + private string _CreateMan; + + private System.Nullable _CreateDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnCNProfessionalIdChanging(string value); + partial void OnCNProfessionalIdChanged(); + partial void OnDraCodeChanging(string value); + partial void OnDraCodeChanged(); + partial void OnReviewDateChanging(System.Nullable value); + partial void OnReviewDateChanged(); + partial void OnUnitWorkIdChanging(string value); + partial void OnUnitWorkIdChanged(); + partial void OnReceiveUnitsChanging(string value); + partial void OnReceiveUnitsChanged(); + partial void OnStatusChanging(string value); + partial void OnStatusChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); + partial void OnCreateManChanging(string value); + partial void OnCreateManChanged(); + partial void OnCreateDateChanging(System.Nullable value); + partial void OnCreateDateChanged(); + #endregion + + public Comprehensive_ReviewDrawings() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + 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="_CNProfessionalId", DbType="NVarChar(50)")] + public string CNProfessionalId + { + get + { + return this._CNProfessionalId; + } + set + { + if ((this._CNProfessionalId != value)) + { + this.OnCNProfessionalIdChanging(value); + this.SendPropertyChanging(); + this._CNProfessionalId = value; + this.SendPropertyChanged("CNProfessionalId"); + this.OnCNProfessionalIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")] + public string DraCode + { + get + { + return this._DraCode; + } + set + { + if ((this._DraCode != value)) + { + this.OnDraCodeChanging(value); + this.SendPropertyChanging(); + this._DraCode = value; + this.SendPropertyChanged("DraCode"); + this.OnDraCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")] + public System.Nullable ReviewDate + { + get + { + return this._ReviewDate; + } + set + { + if ((this._ReviewDate != value)) + { + this.OnReviewDateChanging(value); + this.SendPropertyChanging(); + this._ReviewDate = value; + this.SendPropertyChanged("ReviewDate"); + this.OnReviewDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(500)")] + public string UnitWorkId + { + get + { + return this._UnitWorkId; + } + set + { + if ((this._UnitWorkId != value)) + { + this.OnUnitWorkIdChanging(value); + this.SendPropertyChanging(); + this._UnitWorkId = value; + this.SendPropertyChanged("UnitWorkId"); + this.OnUnitWorkIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveUnits", DbType="NVarChar(800)")] + public string ReceiveUnits + { + get + { + return this._ReceiveUnits; + } + set + { + if ((this._ReceiveUnits != value)) + { + this.OnReceiveUnitsChanging(value); + this.SendPropertyChanging(); + this._ReceiveUnits = value; + this.SendPropertyChanged("ReceiveUnits"); + this.OnReceiveUnitsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(2)")] + public string 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="_Remarks", DbType="NVarChar(500)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this.OnRemarksChanging(value); + this.SendPropertyChanging(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")] + public string CreateMan + { + get + { + return this._CreateMan; + } + set + { + if ((this._CreateMan != value)) + { + this.OnCreateManChanging(value); + this.SendPropertyChanging(); + this._CreateMan = value; + this.SendPropertyChanged("CreateMan"); + this.OnCreateManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")] + public System.Nullable CreateDate + { + get + { + return this._CreateDate; + } + set + { + if ((this._CreateDate != value)) + { + this.OnCreateDateChanging(value); + this.SendPropertyChanging(); + this._CreateDate = value; + this.SendPropertyChanged("CreateDate"); + this.OnCreateDateChanged(); + } + } + } + + 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.Comprehensive_SiteVisaManagement")] public partial class Comprehensive_SiteVisaManagement : INotifyPropertyChanging, INotifyPropertyChanged { @@ -203776,6 +204135,332 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspection_Test_Plan")] + public partial class Inspection_Test_Plan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _UnitId; + + private string _CNProfessionalId; + + private string _PlanCode; + + private string _PlanName; + + private System.Nullable _ApprovalDate; + + private string _AuditMan; + + private string _ApprovalMan; + + private string _Remarks; + + private string _CreateMan; + + private System.Nullable _CreateDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnCNProfessionalIdChanging(string value); + partial void OnCNProfessionalIdChanged(); + partial void OnPlanCodeChanging(string value); + partial void OnPlanCodeChanged(); + partial void OnPlanNameChanging(string value); + partial void OnPlanNameChanged(); + partial void OnApprovalDateChanging(System.Nullable value); + partial void OnApprovalDateChanged(); + partial void OnAuditManChanging(string value); + partial void OnAuditManChanged(); + partial void OnApprovalManChanging(string value); + partial void OnApprovalManChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); + partial void OnCreateManChanging(string value); + partial void OnCreateManChanged(); + partial void OnCreateDateChanging(System.Nullable value); + partial void OnCreateDateChanged(); + #endregion + + public Inspection_Test_Plan() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + 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="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")] + public string CNProfessionalId + { + get + { + return this._CNProfessionalId; + } + set + { + if ((this._CNProfessionalId != value)) + { + this.OnCNProfessionalIdChanging(value); + this.SendPropertyChanging(); + this._CNProfessionalId = value; + this.SendPropertyChanged("CNProfessionalId"); + this.OnCNProfessionalIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCode", DbType="NVarChar(50)")] + public string PlanCode + { + get + { + return this._PlanCode; + } + set + { + if ((this._PlanCode != value)) + { + this.OnPlanCodeChanging(value); + this.SendPropertyChanging(); + this._PlanCode = value; + this.SendPropertyChanged("PlanCode"); + this.OnPlanCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanName", DbType="NVarChar(50)")] + public string PlanName + { + get + { + return this._PlanName; + } + set + { + if ((this._PlanName != value)) + { + this.OnPlanNameChanging(value); + this.SendPropertyChanging(); + this._PlanName = value; + this.SendPropertyChanged("PlanName"); + this.OnPlanNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovalDate", DbType="DateTime")] + public System.Nullable ApprovalDate + { + get + { + return this._ApprovalDate; + } + set + { + if ((this._ApprovalDate != value)) + { + this.OnApprovalDateChanging(value); + this.SendPropertyChanging(); + this._ApprovalDate = value; + this.SendPropertyChanged("ApprovalDate"); + this.OnApprovalDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")] + public string AuditMan + { + get + { + return this._AuditMan; + } + set + { + if ((this._AuditMan != value)) + { + this.OnAuditManChanging(value); + this.SendPropertyChanging(); + this._AuditMan = value; + this.SendPropertyChanged("AuditMan"); + this.OnAuditManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovalMan", DbType="NVarChar(50)")] + public string ApprovalMan + { + get + { + return this._ApprovalMan; + } + set + { + if ((this._ApprovalMan != value)) + { + this.OnApprovalManChanging(value); + this.SendPropertyChanging(); + this._ApprovalMan = value; + this.SendPropertyChanged("ApprovalMan"); + this.OnApprovalManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(50)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this.OnRemarksChanging(value); + this.SendPropertyChanging(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")] + public string CreateMan + { + get + { + return this._CreateMan; + } + set + { + if ((this._CreateMan != value)) + { + this.OnCreateManChanging(value); + this.SendPropertyChanging(); + this._CreateMan = value; + this.SendPropertyChanged("CreateMan"); + this.OnCreateManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")] + public System.Nullable CreateDate + { + get + { + return this._CreateDate; + } + set + { + if ((this._CreateDate != value)) + { + this.OnCreateDateChanging(value); + this.SendPropertyChanging(); + this._CreateDate = value; + this.SendPropertyChanged("CreateDate"); + this.OnCreateDateChanged(); + } + } + } + + 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.InterFaceLog")] public partial class InterFaceLog : INotifyPropertyChanging, INotifyPropertyChanged { @@ -304947,6 +305632,236 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_Construction_Plan")] + public partial class Report_Construction_Plan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitOrMajor; + + private System.Nullable _Quantity1; + + private System.Nullable _Quantity2; + + private System.Nullable _Quantity3; + + private string _Remarks; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnReportIdChanging(string value); + partial void OnReportIdChanged(); + partial void OnReTypeChanging(string value); + partial void OnReTypeChanged(); + partial void OnUnitOrMajorChanging(string value); + partial void OnUnitOrMajorChanged(); + partial void OnQuantity1Changing(System.Nullable value); + partial void OnQuantity1Changed(); + partial void OnQuantity2Changing(System.Nullable value); + partial void OnQuantity2Changed(); + partial void OnQuantity3Changing(System.Nullable value); + partial void OnQuantity3Changed(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); + #endregion + + public Report_Construction_Plan() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")] + public string ReportId + { + get + { + return this._ReportId; + } + set + { + if ((this._ReportId != value)) + { + this.OnReportIdChanging(value); + this.SendPropertyChanging(); + this._ReportId = value; + this.SendPropertyChanged("ReportId"); + this.OnReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NVarChar(20)")] + public string ReType + { + get + { + return this._ReType; + } + set + { + if ((this._ReType != value)) + { + this.OnReTypeChanging(value); + this.SendPropertyChanging(); + this._ReType = value; + this.SendPropertyChanged("ReType"); + this.OnReTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitOrMajor", DbType="NVarChar(200)")] + public string UnitOrMajor + { + get + { + return this._UnitOrMajor; + } + set + { + if ((this._UnitOrMajor != value)) + { + this.OnUnitOrMajorChanging(value); + this.SendPropertyChanging(); + this._UnitOrMajor = value; + this.SendPropertyChanged("UnitOrMajor"); + this.OnUnitOrMajorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity1", DbType="Int")] + public System.Nullable Quantity1 + { + get + { + return this._Quantity1; + } + set + { + if ((this._Quantity1 != value)) + { + this.OnQuantity1Changing(value); + this.SendPropertyChanging(); + this._Quantity1 = value; + this.SendPropertyChanged("Quantity1"); + this.OnQuantity1Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity2", DbType="Int")] + public System.Nullable Quantity2 + { + get + { + return this._Quantity2; + } + set + { + if ((this._Quantity2 != value)) + { + this.OnQuantity2Changing(value); + this.SendPropertyChanging(); + this._Quantity2 = value; + this.SendPropertyChanged("Quantity2"); + this.OnQuantity2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity3", DbType="Int")] + public System.Nullable Quantity3 + { + get + { + return this._Quantity3; + } + set + { + if ((this._Quantity3 != value)) + { + this.OnQuantity3Changing(value); + this.SendPropertyChanging(); + this._Quantity3 = value; + this.SendPropertyChanged("Quantity3"); + this.OnQuantity3Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(200)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this.OnRemarksChanging(value); + this.SendPropertyChanging(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); + } + } + } + + 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.Report_ConstructionProblems")] public partial class Report_ConstructionProblems : INotifyPropertyChanging, INotifyPropertyChanged {