From a7631a1e61dfe72de04419794814ebc657f256c6 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 15 Aug 2023 15:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B1=E6=A3=80=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql | 3 +- DataBase/版本日志/SGGLDB_WH_2023-08-15.sql | 8 ++ SGGL/BLL/BLL.csproj | 1 + .../InspectionManagementService.cs | 18 ++-- .../ProcessControl/InspectionManagement.aspx | 9 +- .../InspectionManagement.aspx.cs | 16 ++++ .../InspectionManagement.aspx.designer.cs | 59 +++++++----- .../InspectionManagementEdit.aspx | 2 +- .../InspectionManagementEdit.aspx.cs | 2 +- .../CQMS/ProcessControl/InspectionNotice.aspx | 11 ++- .../ProcessControl/InspectionNotice.aspx.cs | 95 +++++++++++++------ .../InspectionNotice.aspx.designer.cs | 9 ++ .../ProcessControl/InspectionNoticeEdit.aspx | 8 +- .../InspectionNoticeEdit.aspx.cs | 52 +++++++++- .../InspectionNoticeEdit.aspx.designer.cs | 62 ++++++------ SGGL/FineUIPro.Web/ErrLog.txt | 83 ++++++++++++++++ SGGL/Model/Model.cs | 6 +- .../CQMS/InspectionManagementController.cs | 27 +++++- SGGL/WebAPI/WebAPI.csproj | 3 + 19 files changed, 366 insertions(+), 108 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-08-15.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql b/DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql index 9095259a..ee341dc0 100644 --- a/DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql +++ b/DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql @@ -1 +1,2 @@ -alter table sys_const alter Column ConstValue nvarchar(200) \ No newline at end of file +alter table sys_const alter Column ConstValue nvarchar(200) +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_2023-08-15.sql b/DataBase/版本日志/SGGLDB_WH_2023-08-15.sql new file mode 100644 index 00000000..a180e1c9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-08-15.sql @@ -0,0 +1,8 @@ +alter table ProcessControl_InspectionManagement alter column AcceptanceCheckMan nvarchar(500) null +GO +alter table sys_const alter Column ConstValue nvarchar(200) +GO +alter table Comprehensive_InspectionPerson alter column InspectionPersonCode nvarchar(100) null +GO +alter table Comprehensive_InspectionMachine alter column InspectionMachineCode nvarchar(100) null +GO \ No newline at end of file diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index cf9383d9..293de2b8 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -31,6 +31,7 @@ prompt 4 false + latest pdbonly diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index e1282f93..a1445686 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -87,7 +87,7 @@ namespace BLL if (!string.IsNullOrEmpty(controlPointType)) { string[] types = controlPointType.Split(','); - q = q.Where(e => types.Contains(e.ControlPointType)); + q = q.Where(e=> types.Contains(e.ControlPointType)); } if (UnitWorkId != "0") { @@ -155,8 +155,8 @@ namespace BLL /// /// /// - public static int GetListCount(string projectId, string name, string startDate, string endDate) - { + public static int GetListCount(string projectId, string name, string startDate, string endDate) + { return count; } public static DataSet GetListData(string projectId, string name, string startDate, string endDate, int startRowIndex, int maximumRows) @@ -196,13 +196,13 @@ namespace BLL dataTable.Columns.Add(row.ToString()); } data.Tables.Add(dataTable); - for (int i = startRowIndex; i <= (startRowIndex + maximumRows) && i < dataSet.Tables[0].Rows.Count; i++) + for (int i = startRowIndex; i <= (startRowIndex + maximumRows)&&i /// 根据id修改验收日期和是否一次合格 /// - public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement) - { + public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId); @@ -386,11 +385,8 @@ namespace BLL { newInspectionManagement.InspectionDate = inspectionManagement.InspectionDate; newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified; - if (newInspectionManagement.IsOnceQualified == false) - { - newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason; - } newInspectionManagement.InspectionCode = inspectionManagement.InspectionCode; + newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx index 18567721..cfb5ac56 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx @@ -65,9 +65,14 @@ - - + --%> + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 4a248423..c00eba2c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -251,5 +251,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl Response.End(); } #endregion + + /// + /// 获取检查人名称 + /// + /// + /// + protected string ConvertCheckMan(object CarryUnitIds) + { + var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds); + if (string.IsNullOrEmpty(uname)) + { + uname = CarryUnitIds.ToString(); + } + return uname; + + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs index 5a5b5b2d..914a43ba 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.ProcessControl { - - - public partial class InspectionManagement { - +namespace FineUIPro.Web.CQMS.ProcessControl +{ + + + public partial class InspectionManagement + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// drpUnitWork 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// drpCNProfessional 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessional; - + /// /// txtStarTime 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// btnSearch 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnOut 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblPageIndex 控件。 /// @@ -128,7 +130,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label3; + /// /// lbtnFileUrl 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx index 13af7928..8d3aeefb 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx @@ -38,7 +38,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs index 18572f8b..1f6c5cd9 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim()); this.Grid1.DataBind(); this.txtInspectionCode.Text = inspectionManagement.InspectionCode; - this.txtInspectionDate.Text = inspectionManagement.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", inspectionManagement.InspectionDate) : ""; + this.txtInspectionDate.Text = inspectionManagement.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", inspectionManagement.InspectionDate) : ""; } } } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx index c7668403..14cd79aa 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx @@ -64,9 +64,16 @@ - - + --%> + + + + + + + x.InspectionId == Grid1.SelectedRowID); + if (model.IsOnceQualified==true) + { + Alert.ShowInTop("该共检通知单已合格，不允许修改！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionNoticeEdit.aspx?InspectionId={0}", Grid1.SelectedRowID, "编辑 - "))); } #endregion @@ -306,17 +314,17 @@ namespace FineUIPro.Web.CQMS.ProcessControl var units = (from x in db.Base_Unit join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId - where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitType == BLL.Const.ProjectUnitType_4 + where y.ProjectId==this.CurrUser.LoginProjectId && y.UnitType== BLL.Const.ProjectUnitType_4 orderby x.UnitName select x).FirstOrDefault(); - if (units != null) + if (units!=null) { bookmarkUnitName.Text = units.UnitName; } } var projectModel = db.Base_Project.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).FirstOrDefault(); var inspectionModel = db.ProcessControl_InspectionManagement.Where(x => x.InspectionId == Id).FirstOrDefault(); - + //项目编号 Bookmark bookmarkProjectCode = doc.Range.Bookmarks["projectCode"]; if (bookmarkProjectCode != null) @@ -362,7 +370,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl var valModel = db.Sys_User.Where(x => x.UserId == inspectionModel.CompileMan).FirstOrDefault(); if (inspectionModel != null && valModel != null) { - bookmarkunitNamefbs.Text = valModel.UserName; + bookmarkcompileMan.Text = valModel.UserName; } } //总承包商名称 @@ -387,7 +395,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { if (inspectionModel != null) { - bookmarkinspectionDate.Text = inspectionModel.InspectionDate.ToString().Split(' ')[0].Replace("/", "-"); + bookmarkinspectionDate.Text = inspectionModel.InspectionDate.ToString().Replace("/", "-"); } } //共检地点 @@ -446,7 +454,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.StartTable(); builder.CellFormat.Borders.LineStyle = Aspose.Words.LineStyle.Single; builder.CellFormat.Borders.Color = System.Drawing.Color.Black; - + builder.Bold = false; builder.RowFormat.Height = 20; builder.Font.Size = 10; @@ -462,8 +470,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { builder.RowFormat.Height = 200 / ManagementDetaillList.Count; } - else - { + else { builder.RowFormat.Height = 20; } builder.CellFormat.Borders.Left.LineWidth = 1; @@ -474,7 +481,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.CellFormat.Width = 156; builder.Write(ConvertControlPointType(item.ControlPointType)); builder.CellFormat.Borders.Left.LineWidth = 0; - // 控制点等级 + // 控制点等级 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; @@ -484,12 +491,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl var ControlPointType = ConvertClass(item.ControlPointType); #region 控制点等级 - if (ControlPointType.Contains("A")) + if (ControlPointType.Contains("A") ) { builder.Write("■A "); } - else - { + else { builder.Write("□A "); } if (ControlPointType.Contains("B")) @@ -516,7 +522,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 113.5; - builder.Write(""); + var ControlBasis = ConvertBasis(item.ControlPointType); + builder.Write(ControlBasis); //合并单元格 builder.InsertCell(); @@ -694,24 +701,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐 builder.CellFormat.Width = 487.5; builder.ParagraphFormat.LineSpacing = 16; //设置1倍行距 12就是一倍行距 - builder.Write("备注：\r\r\r\r\r\r验收意见：\r总承包商意见： □合格 □不合格\r\r监理意见： □合格 □不合格\r\r业主意见： □合格 □不合格\r\r\r"); + builder.Write("备注：\r\r验收意见：\r总承包商意见： □合格 □不合格\r监理意见： □合格 □不合格\r业主意见： □合格 □不合格\r "); + #region 生成二维码 + + string imageUrl = Funs.RootPath + CreateQRCodeService.CreateCode_Simple("InspectionNotice$" + Id); + if (File.Exists(imageUrl)) + { + builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//水平居中对齐 + builder.InsertImage(imageUrl, 100, 100); + } + #endregion builder.EndRow(); builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐 builder.Write("注：如果业主有规定，执行业主的规定。 "); #endregion - #region 生成二维码 - - string imageUrl = Funs.RootPath + CreateQRCodeService.CreateCode_Simple("InspectionNotice$" + Id); - if (File.Exists(imageUrl)) - { - builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Top;//垂直居中对齐 - builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//水平居中对齐 - builder.InsertImage(imageUrl, 100, 100); - } - #endregion - doc.Save(newUrl); + + doc.Save(newUrl); string fileName = Path.GetFileName(newUrl); FileInfo info = new FileInfo(newUrl); long fileSize = info.Length; @@ -732,8 +739,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl } } - public class WorkBranchList - { + public class WorkBranchList { public string UnitWorkId { get; set; } public string Branch { get; set; } } @@ -814,6 +820,41 @@ namespace FineUIPro.Web.CQMS.ProcessControl } return name; } + + /// + /// 获取执行依据 + /// + /// + /// + protected string ConvertBasis(object ControlPointType) + { + string name = string.Empty; + if (ControlPointType != null) + { + var controlPointType = BLL.BreakdownProjectService.GetBreakdownProjectById(ControlPointType.ToString()); + if (controlPointType != null) + { + name = controlPointType.Basis; + } + } + return name; + } + + /// + /// 获取检查人名称 + /// + /// + /// + protected string ConvertCheckMan(object CarryUnitIds) + { + var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds); + if (string.IsNullOrEmpty(uname)) + { + uname = CarryUnitIds.ToString(); + } + return uname; + + } #endregion #endregion } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs index ef6695b7..9f1a0b58 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs @@ -140,6 +140,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// protected global::System.Web.UI.WebControls.Label lblPageIndex; + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label3; + /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx index c5449cf3..a35a5c0f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx @@ -56,14 +56,18 @@ --%> - - + + <%-- --%> + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index e59a01ea..51157c2e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -21,7 +21,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl GetButtonPower(); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 - + UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, false); this.hdInspectionNoticeId.Text = Request.Params["inspectionId"]; if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text)) { @@ -37,7 +37,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId; } this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite; - this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan; + if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan)) + { + this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(','); + } this.txtNoticeCode.Text = inspectionManagement.NoticeCode; this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim()); this.Grid1.DataBind(); @@ -74,6 +77,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl Alert.ShowInTop("请先选择专业！", MessageBoxIcon.Warning); return; } + + Model.ProcessControl_InspectionManagement inspectionManagement = new Model.ProcessControl_InspectionManagement(); inspectionManagement.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnit.SelectedValue != BLL.Const._Null) @@ -86,9 +91,28 @@ namespace FineUIPro.Web.CQMS.ProcessControl } inspectionManagement.NoticeCode = this.txtNoticeCode.Text.Trim(); inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim(); - inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); + + //检查人 + string CheckManIds = string.Empty; + foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray) + { + CheckManIds += item + ","; + } + if (!string.IsNullOrEmpty(CheckManIds)) + { + CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(",")); + } + inspectionManagement.AcceptanceCheckMan = CheckManIds; + //inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); if (string.IsNullOrEmpty(Request.Params["inspectionId"])) { + //编号不能重复 + var InspectionManagementModel = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.NoticeCode == this.txtNoticeCode.Text.Trim()); + if (InspectionManagementModel != null) + { + ShowNotify("共检通知单编号已存在，不能重复！", MessageBoxIcon.Warning); + return; + } inspectionManagement.CompileMan = this.CurrUser.UserId; inspectionManagement.CompileDate = DateTime.Now; if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text.Trim())) @@ -100,13 +124,35 @@ namespace FineUIPro.Web.CQMS.ProcessControl inspectionManagement.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement)); this.hdInspectionNoticeId.Text = inspectionManagement.InspectionId; } + var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); + if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + { + Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + return; + } + BLL.InspectionManagementService.AddInspectionManagement(inspectionManagement); } else { + //编号不能重复 + var InspectionManagementModel = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.NoticeCode == this.txtNoticeCode.Text.Trim() + && x.InspectionId!= Request.Params["inspectionId"]); + if (InspectionManagementModel != null) + { + ShowNotify("共检通知单编号已存在，不能重复！", MessageBoxIcon.Warning); + return; + } + Model.ProcessControl_InspectionManagement oldInspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim()); inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2; inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim(); + var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); + if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + { + Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + return; + } BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement); BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId); } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs index 74ed61b6..90502fd5 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.ProcessControl { - - - public partial class InspectionNoticeEdit { - +namespace FineUIPro.Web.CQMS.ProcessControl +{ + + + public partial class InspectionNoticeEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnit 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpCNProfessionalId 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtNoticeCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtNoticeCode; - + /// /// txtAcceptanceSite 控件。 /// @@ -74,16 +76,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAcceptanceSite; - + /// - /// txtAcceptanceCheckMan 控件。 + /// drpAcceptanceCheckMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAcceptanceCheckMan; - + protected global::FineUIPro.DropDownList drpAcceptanceCheckMan; + /// /// Label1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// Panel2 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Grid1 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar4 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar4; - + /// /// btnNew 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// Label2 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// Label3 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// Label5 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label5; - + /// /// Label4 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label4; - + /// /// Toolbar1 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdItemsString 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdItemsString; - + /// /// hdInspectionNoticeId 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdInspectionNoticeId; - + /// /// btnSave 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// Window1 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 5bb8612c..c761ce70 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -20,3 +20,86 @@ IP地址:::1 出错时间:08/10/2023 11:35:38 + +错误信息开始=====> +错误类型:ChangeConflictException +错误信息:找不到行或行已更改。 +错误堆栈: + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 391 + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 334 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:08/14/2023 21:31:51 +出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionPersonDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:08/14/2023 21:31:51 + + +错误信息开始=====> +错误类型:SqlException +错误信息:将截断字符串或二进制数据。 +语句已终止。 +错误堆栈: + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 391 + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 334 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:08/14/2023 21:34:58 +出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionPersonDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:08/14/2023 21:34:58 + + +错误信息开始=====> +错误类型:SqlException +错误信息:将截断字符串或二进制数据。 +语句已终止。 +错误堆栈: + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionMachineDataIn.aspx.cs:行号 397 + 在 FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionMachineDataIn.aspx.cs:行号 340 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:08/14/2023 21:36:04 +出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionMachineDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:08/14/2023 21:36:04 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Solution\EditConstructSolution.aspx(135): error CS1061: “ASP.cqms_solution_editconstructsolution_aspx”不包含“btnEditWord_Click”的定义，并且找不到可接受类型为“ASP.cqms_solution_editconstructsolution_aspx”的第一个参数的扩展方法“btnEditWord_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) +出错时间:08/15/2023 15:10:11 +出错文件:http://localhost:8579/CQMS/Solution/EditConstructSolution.aspx +IP地址:::1 + +出错时间:08/15/2023 15:10:11 + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index fe0501a5..41cac1d2 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -260744,7 +260744,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(500)")] public string AcceptanceCheckMan { get @@ -320055,7 +320055,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(200)")] public string ConstValue { get @@ -361533,7 +361533,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(500)")] public string AcceptanceCheckMan { get diff --git a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs index b4ad158a..2196ab78 100644 --- a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs @@ -12,6 +12,31 @@ namespace WebAPI.Controllers.CQMS /// public class InspectionManagementController : ApiController { + /// + /// 首次扫描执行，加载数据 + /// + /// + /// + [HttpGet] + public Model.ResponeData GetPersonQuality(string InspectionNoticeMenuId) { + var responeData = new Model.ResponeData(); + try + { + var model = BLL.InspectionManagementService.GetInspectionManagementById(InspectionNoticeMenuId); + if (model!=null) + { + responeData.data = model; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } + #region 根据二维码ID验收日期、是否一次合格 /// /// 根据二维码ID修改验收日期、是否一次合格 @@ -26,7 +51,7 @@ namespace WebAPI.Controllers.CQMS { InspectionManagementService.UpdateByInspectionManagementId(model); //上传附件 - SaveAttachFile(model.InspectionId + "R", BLL.Const.InspectionNoticeMenuId, model.AttachUrl); + SaveAttachFile(model.InspectionId, BLL.Const.InspectionNoticeMenuId, model.AttachUrl); } catch (Exception ex) { diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 39a40fbc..6f0be619 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -349,6 +349,9 @@ SgManager.AI + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)