From 016ea897dc73a636c939d2d1a4dc4eb4ec2f4899 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 19 Apr 2024 10:13:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20240419=20NCR=E9=99=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-18-bwj.sql | 3 + SGGL/BLL/CQMS/Check/JointCheckService.cs | 10 + .../Comprehensive/SpecialEquipmentService.cs | 2 + SGGL/BLL/Common/Const.cs | 5 + SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx | 3 + .../CQMS/Check/JointCheck.aspx.cs | 184 ++ .../CQMS/Check/JointCheck.aspx.designer.cs | 9 + .../CQMS/Comprehensive/NCRManagementEdit.aspx | 2 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 24 +- .../CQMS/Comprehensive/SpecialEquipment.aspx | 3 + .../Comprehensive/SpecialEquipment.aspx.cs | 2 +- .../Comprehensive/SpecialEquipmentEdit.aspx | 1 + .../SpecialEquipmentEdit.aspx.cs | 4 + .../SpecialEquipmentEdit.aspx.designer.cs | 65 +- .../File/Excel/CQMS/质量专项检查模版.xlsx | Bin 0 -> 10196 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/Model/Model.cs | 1811 ++++++++++------- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 18 files changed, 1352 insertions(+), 780 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql new file mode 100644 index 00000000..778001ef --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql @@ -0,0 +1,3 @@ + +alter table Comprehensive_SpecialEquipment add PositionNum nvarchar(50) +go \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Check/JointCheckService.cs b/SGGL/BLL/CQMS/Check/JointCheckService.cs index 7e6a43ec..bdd02f6d 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckService.cs @@ -518,5 +518,15 @@ namespace BLL db.SubmitChanges(); } } + + /// + /// 根据项目Id获取专项检查 + /// + /// + /// + public static List GetDriverPlanByProjectId(string projectId) + { + return (from x in Funs.DB.Check_JointCheck where x.ProjectId == projectId select x).ToList(); + } } } diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index 6d0f4537..a3f7f589 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -105,6 +105,7 @@ namespace BLL newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber; newEquipment.CompileMan = SpecialEquipment.CompileMan; newEquipment.Status = SpecialEquipment.Status; + newEquipment.PositionNum = SpecialEquipment.PositionNum; db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment); db.SubmitChanges(); } @@ -127,6 +128,7 @@ namespace BLL newEquipment.SubmitDataNumber = SpecialEquipment.SubmitDataNumber; newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber; newEquipment.Status = SpecialEquipment.Status; + newEquipment.PositionNum = SpecialEquipment.PositionNum; db.SubmitChanges(); } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index ff6456f1..841ddca2 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3250,6 +3250,11 @@ namespace BLL /// 培训记录导入模板原始虚拟路径 /// public const string CQMS_TrainingRecordsTemplateUrl= "File\\Excel\\DataIn\\培训记录导入模板.xlsx"; + + /// + /// 质量专项检查模板文件原始虚拟路径 + /// + public const string JointCheckTempUrl = "File\\Excel\\CQMS\\质量专项检查模版.xlsx"; #endregion #region 绩效考核模板文件路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx index 765c8c30..7a597f11 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx @@ -75,6 +75,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs index 6e3bb4a7..34e2e611 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; @@ -401,5 +402,188 @@ namespace FineUIPro.Web.CQMS.Check txtEndTime.Text = ""; bindata(); } + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.JointCheckTempUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + var lists = BLL.JointCheckService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId); + if (lists != null) + { + newUrl = uploadfilepath.Replace("质量专项检查模版.xlsx", "质量专项检查.xlsx"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 1; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + cell.SetCellValue(i.ToString());//序号 + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.JointCheckCode); + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(BLL.UnitService.GetUnitNameByUnitId(item.UnitId)); + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + string checkName = string.Empty; + if (item.CheckType == "1") + { + checkName = "周检查"; + } + else if (item.CheckType == "2") + { + checkName = "月检查"; + } + else if (item.CheckType == "3") + { + checkName = "不定期检查"; + } + else if (item.CheckType == "4") + { + checkName = "专业检查"; + } + cell.SetCellValue(checkName); + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CheckName); + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : ""); + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(BLL.UserService.GetUserNameByUserId(item.CheckMan)); + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + string state = string.Empty; + if (item.State.ToString() == BLL.Const.JointCheck_ReCompile) + { + state = "重新编制"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Compile) + { + state = "编制"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit1) + { + state = "分包专工回复"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit2) + { + state = "分包负责人审批"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit3) + { + state = "总包专工回复"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit4) + { + state = "总包负责人审批"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Complete) + { + state = "审批完成"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Z) + { + state = "整改中"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit1R) + { + state = "分包专工重新回复"; + } + cell.SetCellValue(state); + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + string userNames = string.Empty; + List list = BLL.JointCheckApproveService.GetJointCheckApprovesByJointCheckId(item.JointCheckId); + foreach (var a in list) + { + if (a != null) + { + if (a.ApproveMan != null) + { + if (!userNames.Contains(BLL.UserService.GetUserByUserId(a.ApproveMan).UserName)) + { + userNames += UserService.GetUserByUserId(a.ApproveMan).UserName + ","; + } + } + } + } + if (!string.IsNullOrEmpty(userNames)) + { + userNames = userNames.Substring(0, userNames.LastIndexOf(",")); + } + cell.SetCellValue(userNames); + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs index 5ca52c9c..8f7cbdb0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs @@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Check { /// protected global::FineUIPro.Button btnNew; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 653c6db2..b0d36bb2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -88,7 +88,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 0b4321f5..3ffaff70 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -275,12 +275,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); this.hdAttachUrl.Text = nCRManagement.NCRManagementId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - return; - } + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} nCRManagement.CompileMan = this.CurrUser.UserId; nCRManagement.Status = BLL.Const.Comprehensive_Compile; BLL.NCRManagementService.AddNCRManagement(nCRManagement); @@ -288,12 +288,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { nCRManagement.NCRManagementId = this.NCRManagementId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - return; - } + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); if (model != null) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx index a08d66b8..5c5f0f85 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx @@ -48,6 +48,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs index 81356dcf..03e0f526 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs @@ -32,7 +32,7 @@ namespace FineUIPro.Web.Comprehensive public void BindGrid() { string strSql = @"select C.SpecialEquipmentId, ProjectId,C.EquipmentId, SunNumber, Status, - InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName + InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName,PositionNum from Comprehensive_SpecialEquipment C left join Base_Unit U on C.UnitId=U.UnitId left join Base_SpecialEquipment eq on eq.SpecialEquipmentId = C.EquipmentId diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 115203ae..318daf38 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -33,6 +33,7 @@ + //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class SpecialEquipmentEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class SpecialEquipmentEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnit 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpEquipmentId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpEquipmentId; - + /// /// txtSunNumber 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSunNumber; - + /// /// txtInformNumber 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtInformNumber; - + /// /// txtSubmitDataNumber 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSubmitDataNumber; - + /// /// txtMonitoringReportNumber 控件。 /// @@ -94,7 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtMonitoringReportNumber; - + + /// + /// txtPositionNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPositionNum; + /// /// Panel2 控件。 /// @@ -103,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// txtReportTime 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReportTime; - + /// /// agree 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx b/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..37d2fbc1caa1a9b263a7ff9cb33b4b4ff0a6c45a GIT binary patch literal 10196 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 bQhwEc6{KMvvlwuYK!^AM)|u|b!^q3 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0f1863ef..c3200bad 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1457,6 +1457,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2015,6 +2018,9 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); + partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -6493,6 +6499,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7981,6 +7995,14 @@ namespace Model } } + public System.Data.Linq.Table Report_CQMS_ProblemHandle + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_CqmsTarget { get @@ -21530,8 +21552,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21548,7 +21568,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21632,19 +21651,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21664,18 +21670,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -97436,10 +97430,10 @@ namespace Model private string _AuditMan; - private string _Problem; - private string _Measure; + private string _Problem; + private EntityRef _Sys_User; private EntityRef _Base_CNProfessional; @@ -97486,10 +97480,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnProblemChanging(string value); - partial void OnProblemChanged(); partial void OnMeasureChanging(string value); partial void OnMeasureChanged(); + partial void OnProblemChanging(string value); + partial void OnProblemChanged(); #endregion public Comprehensive_NCRManagement() @@ -97857,27 +97851,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] - public string Problem - { - get - { - return this._Problem; - } - set - { - if ((this._Problem != value)) - { - this.OnProblemChanging(value); - this.SendPropertyChanging(); - this._Problem = value; - this.SendPropertyChanged("Problem"); - this.OnProblemChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] public string Measure { get @@ -97897,6 +97871,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + public string Problem + { + get + { + return this._Problem; + } + set + { + if ((this._Problem != value)) + { + this.OnProblemChanging(value); + this.SendPropertyChanging(); + this._Problem = value; + this.SendPropertyChanged("Problem"); + this.OnProblemChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -101143,6 +101137,8 @@ namespace Model private System.Nullable _ReportTime; + private string _PositionNum; + private EntityRef _Sys_User; private EntityRef _Base_Project; @@ -101177,6 +101173,8 @@ namespace Model partial void OnAuditManChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); + partial void OnPositionNumChanging(string value); + partial void OnPositionNumChanged(); #endregion public Comprehensive_SpecialEquipment() @@ -101439,6 +101437,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PositionNum", DbType="NVarChar(50)")] + public string PositionNum + { + get + { + return this._PositionNum; + } + set + { + if ((this._PositionNum != value)) + { + this.OnPositionNumChanging(value); + this.SendPropertyChanging(); + this._PositionNum = value; + this.SendPropertyChanged("PositionNum"); + this.OnPositionNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_SpecialEquipment_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -120067,8 +120085,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -120120,7 +120136,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -120199,10 +120214,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -120522,40 +120533,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -120726,8 +120703,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -120751,7 +120726,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -120799,7 +120773,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -120810,10 +120784,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -120937,40 +120907,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -234734,6 +234670,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + 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.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -240933,6 +241092,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -241205,6 +241366,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -243385,6 +243547,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -243966,6 +244141,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -272310,7 +272497,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -272324,18 +272511,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -272352,8 +272541,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -272366,18 +272555,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -272505,22 +272696,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -272645,26 +272836,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -272685,26 +272856,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -272765,6 +272916,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -272806,14 +273017,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -272832,14 +273043,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -272987,26 +273198,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -273067,6 +273258,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -273999,7 +274210,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -274122,6 +274333,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -274130,6 +274347,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -274140,9 +274363,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -274152,35 +274373,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -274202,6 +274413,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -274210,6 +274427,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -274220,10 +274443,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -274232,36 +274453,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -274429,6 +274640,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -274509,6 +274780,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -274609,42 +274940,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -274729,26 +275040,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -274769,6 +275060,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -274789,66 +275100,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -274869,26 +275120,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -274909,122 +275140,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -275092,22 +275303,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -275120,6 +275315,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275160,22 +275371,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -275188,6 +275383,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -275555,166 +275766,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -275735,7 +275786,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -275835,6 +275886,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -276836,8 +277047,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -276848,11 +277057,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -276868,6 +277075,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -276904,8 +277115,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -276916,12 +277125,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -276936,6 +277143,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -277245,26 +277456,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -277365,26 +277556,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -277405,22 +277576,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -277565,6 +277736,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -278277,7 +278488,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -313162,6 +313373,164 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] + public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitName; + + private string _ProblemDes; + + #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 OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnProblemDesChanging(string value); + partial void OnProblemDesChanged(); + #endregion + + public Report_CQMS_ProblemHandle() + { + 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="NChar(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="_UnitName", DbType="NVarChar(100)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] + public string ProblemDes + { + get + { + return this._ProblemDes; + } + set + { + if ((this._ProblemDes != value)) + { + this.OnProblemDesChanging(value); + this.SendPropertyChanging(); + this._ProblemDes = value; + this.SendPropertyChanged("ProblemDes"); + this.OnProblemDesChanged(); + } + } + } + + 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_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -349459,8 +349828,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -350175,7 +350542,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -352567,19 +352933,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -357072,18 +357425,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From 44580d9acbef1e2d00107fe5913f09523b7ef475 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 19 Apr 2024 15:34:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20240419=20NCR=E3=80=81=E5=9B=BE=E7=BA=B8?= =?UTF-8?q?=E6=94=B6=E5=8F=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/ProjectData/UnitWorkService.cs | 19 ++ SGGL/BLL/SysManage/UnitService.cs | 6 +- .../DesignDrawingsDataIn.aspx.cs | 167 ++++++++------ .../Comprehensive/NCRManagementDataIn.aspx.cs | 100 +++++--- .../CQMS/Comprehensive/NCRManagementEdit.aspx | 2 +- SGGL/FineUIPro.Web/ErrLog.txt | 215 ------------------ .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 19968 -> 20480 bytes .../Excel/DataIn/图纸收发记录导入模板.xls | Bin 19456 -> 19968 bytes SGGL/FineUIPro.Web/Web.config | 2 +- 9 files changed, 191 insertions(+), 320 deletions(-) diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index e3ef0752..16e48681 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -590,5 +590,24 @@ namespace BLL } return name; } + + public static string GetUnitWorkIdsByUnitWorkNames(string projectId,string unitWorks) + { + if (!string.IsNullOrEmpty(unitWorks)) + { + string[] ins = unitWorks.Split(','); + string unitIds = string.Empty; + foreach (string s in ins) + { + var q = GetUnitWorkByUnitWorkName(projectId, s.Trim()).UnitWorkId; + unitIds += q + ","; + } + return unitIds.Substring(0, unitIds.LastIndexOf(',')); + } + else + { + return string.Empty; + } + } } } diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index 4e193bbb..136f269c 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -671,10 +671,10 @@ namespace BLL string unitIds = string.Empty; foreach (string s in ins) { - var q = BLL.UnitService.getUnitByUnitName(s); - unitIds = unitIds + q.UnitId + ","; + var q = getUnitByUnitName(s.Trim()); + unitIds += q.UnitId + ","; } - return unitIds.Substring(0, unitIds.Length - 1); + return unitIds.Substring(0, unitIds.LastIndexOf(",")); } else { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs index 5dbff734..10c4bd77 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 11); + AddDatasetToSQL(ds.Tables[0], 12); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); @@ -196,35 +201,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive } string row2 = pds.Rows[i][2].ToString(); - if (string.IsNullOrEmpty(row2)) + if (!string.IsNullOrEmpty(row2)) { - result += (i + 2).ToString() + "," + "图纸内容" + "," + "此项为必填项！" + "|"; - } - - string row4 = pds.Rows[i][4].ToString(); - if (!string.IsNullOrEmpty(row4)) - { - try + string[] reunit = row2.Split(','); + foreach (string unitWork in reunit) { - Int32 date = Convert.ToInt32(row4.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "页数" + "," + "[" + row4 + "]错误！" + "|"; + var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|"; + } } } string row5 = pds.Rows[i][5].ToString(); - if (!string.IsNullOrEmpty(row5)) + if (string.IsNullOrEmpty(row5)) { - try - { - DateTime date = Convert.ToDateTime(row5.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row5 + "]错误！" + "|"; - } + result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; } string row6 = pds.Rows[i][6].ToString(); @@ -232,38 +225,53 @@ namespace FineUIPro.Web.CQMS.Comprehensive { try { - DateTime date = Convert.ToDateTime(row6.Trim()); + Int32 date = Convert.ToInt32(row6.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row6 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "页数" + "," + "[" + row6 + "]错误！" + "|"; } } string row7 = pds.Rows[i][7].ToString(); if (!string.IsNullOrEmpty(row7)) { - string[] reunit = row7.Split(','); - foreach (string unit in reunit) + try { - var u = units.Where(x => x.UnitName == unit).FirstOrDefault(); - if (u == null) - { - result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|"; - } + DateTime date = Convert.ToDateTime(row7.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row7 + "]错误！" + "|"; } } - string row10 = pds.Rows[i][10].ToString(); - if (string.IsNullOrEmpty(row10)) + string row8 = pds.Rows[i][8].ToString(); + if (!string.IsNullOrEmpty(row8)) { - result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; + try + { + DateTime date = Convert.ToDateTime(row8.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row8 + "]错误！" + "|"; + } + } + + string row9 = pds.Rows[i][9].ToString(); + if (!string.IsNullOrEmpty(row9)) + { + string[] reunit = row9.Split(','); + foreach (string unit in reunit) + { + var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|"; + } + } } - //} - //else - //{ - // result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|"; - //} } if (!string.IsNullOrEmpty(result)) { @@ -369,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 11); + AddDatasetToSQL2(ds.Tables[0], 12); } catch (Exception ex) { @@ -408,72 +416,84 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { Model.Comprehensive_DesignDrawings oldViewInfo = new Model.Comprehensive_DesignDrawings(); string row0 = pds.Rows[i][0].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][5].ToString().Trim() ).FirstOrDefault(); if (oldViewInfo == null) { Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings(); des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); des.ProjectId = this.CurrUser.LoginProjectId; - des.CNProfessionalId = cn.CNProfessionalId; - des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim(); - des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim(); - des.Edition = pds.Rows[i][3].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) + des.CNProfessionalId = cn.CNProfessionalId;//专业名称 + des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号 + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程 { - des.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim()); - } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim()); + des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim()); } + des.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 + des.Edition = pds.Rows[i][4].ToString().Trim();//版次 + des.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - des.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim()); + des.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][7].ToString().Trim()); + des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 } - des.ReceiveMan = pds.Rows[i][8].ToString().Trim(); - des.Remark = pds.Rows[i][9].ToString().Trim(); - des.RemarkCode = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) + { + des.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + } + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) + { + des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 + } + des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 + des.Remark = pds.Rows[i][11].ToString().Trim();//备注 BLL.DesignDrawingsService.AddDesignDrawings(des); } else { - oldViewInfo.CNProfessionalId = cn.CNProfessionalId; - oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim(); - oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim(); - oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) + oldViewInfo.CNProfessionalId = cn.CNProfessionalId;//专业名称 + oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号 + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程 { - oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim()); - } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim()); + oldViewInfo.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim()); } + oldViewInfo.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 + oldViewInfo.Edition = pds.Rows[i][4].ToString().Trim();//版次 + oldViewInfo.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim()); + oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - oldViewInfo.ReceiveUnits = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == (pds.Rows[i][7].ToString().Trim())).UnitId; + oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 } - oldViewInfo.ReceiveMan = pds.Rows[i][8].ToString().Trim(); - oldViewInfo.Remark = pds.Rows[i][9].ToString().Trim(); - oldViewInfo.RemarkCode = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) + { + oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + } + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) + { + oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 + } + oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 + oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注 BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo); } } - } else { @@ -484,7 +504,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs index 292b42e1..3501480b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 10); + AddDatasetToSQL(ds.Tables[0], 13); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); @@ -225,40 +230,72 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row5 = pds.Rows[i][5].ToString(); if (!string.IsNullOrEmpty(row5)) { - string[] reunit = row5.Split(','); - foreach (string unit in reunit) + if (row5 != "过程监督不到位" && row5 != "质量缺陷" && row5 != "质量管理问题" && row5 != "不按设计要求施工" && row5 != "不按程序施工" && row5 != "成品保护不到位") { - var u = units.Where(x => x.UnitName == unit).FirstOrDefault(); - if (u == null) - { - result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|"; - } + result += (i + 2).ToString() + "," + "问题类别" + "," + "[" + row5 + "]错误！" + "|"; } } string row7 = pds.Rows[i][7].ToString(); if (!string.IsNullOrEmpty(row7)) { - try + string[] reunit = row7.Split(','); + foreach (string unitWork in reunit) { - DateTime date = Convert.ToDateTime(row7.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row7 + "]错误！" + "|"; + var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|"; + } } } string row8 = pds.Rows[i][8].ToString(); if (!string.IsNullOrEmpty(row8)) + { + string[] reunit = row8.Split(','); + foreach (string unit in reunit) + { + var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|"; + } + } + } + + string row9 = pds.Rows[i][9].ToString().Trim(); + if (!string.IsNullOrEmpty(row9)) + { + if (row9 != "整改中" && row9 != "已闭合") + { + result += (i + 2).ToString() + "," + "实施状态" + "," + "[" + row9 + "]错误！" + "|"; + } + } + + string row11 = pds.Rows[i][11].ToString(); + if (!string.IsNullOrEmpty(row11)) { try { - DateTime date = Convert.ToDateTime(row8.Trim()); + DateTime date = Convert.ToDateTime(row11.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row8 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|"; + } + } + + string row12 = pds.Rows[i][12].ToString(); + if (!string.IsNullOrEmpty(row12)) + { + try + { + DateTime date = Convert.ToDateTime(row12.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|"; } } } @@ -366,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 10); + AddDatasetToSQL2(ds.Tables[0], 13); } catch (Exception ex) { @@ -405,6 +442,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement(); @@ -426,20 +468,27 @@ namespace FineUIPro.Web.CQMS.Comprehensive { des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim()); } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][5].ToString().Trim()); - } - des.ImplementationFrontState = pds.Rows[i][6].ToString().Trim(); + des.Problem = pds.Rows[i][5].ToString().Trim(); + des.Measure = pds.Rows[i][6].ToString().Trim(); if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - des.ClosedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim()); + des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim()); } if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - des.CompleteDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); + des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim()); + } + + des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim(); + des.ResponsibleMan = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim())) + { + des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); + } + if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + { + des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } - des.ResponsibleMan = pds.Rows[i][9].ToString().Trim(); BLL.NCRManagementService.AddNCRManagement(des); } } @@ -454,7 +503,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index b0d36bb2..bd1f658c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -35,7 +35,7 @@ - + diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 56e6d7c8..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,215 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 -无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 -错误堆栈: - 在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.DataShow.InspectionManagementItem.BindGrid() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 74 - 在 FineUIPro.Web.DataShow.InspectionManagementItem.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 32 - 在 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) -出错时间:04/17/2024 17:23:37 -出错文件:http://localhost:8579/DataShow/InspectionManagementItem.aspx?projectId=32d0bca0-7693-4bd6-813d-6ee174ba29d3 -IP地址:::1 -操作人员:JT - -出错时间:04/17/2024 17:23:37 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: source -错误堆栈: - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInvocation(InvocationExpression invoke) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 544 - 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 91 - 在 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) -出错时间:04/18/2024 11:19:17 -出错文件:http://localhost:8579/common/main_new.aspx -IP地址:::1 -操作人员:JT - -出错时间:04/18/2024 11:19:17 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180 -出错时间:04/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045 -出错时间:04/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941 -出错时间:04/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883 -出错时间:04/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: source -错误堆栈: - 在 System.Linq.Enumerable.OfType[TResult](IEnumerable source) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 546 - 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 92 - 在 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) -出错时间:04/18/2024 14:10:41 -出错文件:http://localhost:8579/common/main_new.aspx -IP地址:::1 -操作人员:JT - -出错时间:04/18/2024 14:10:41 - diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls index 877d056a592632b0fc02ab9c0fccb6fc6c3b395a..ff2cba5f0bf54b5602eeb5831fd98f4fd1cf315f 100644 GIT binary patch delta 2900 zcmbtWdu&tZ6+hqgJ9hktAJ=gl+lfu$IEn2zPbUsIsha@mAQZOIu`Fe4`j}ckG}Q#O zjnUZHmZF9HfTGf}bbnMU(*`V6D{W;BTSeKViE2XX#45E?X(!ee(6(-enxO5pndw&M z7%;BKVPjtZ^Wlp%c-y#Iyp0tm^=1mAC0JcSuPQtXeU}t5wQ2p@HuBI}#%6qIO5vE< zkL@N8J}?C^ZT8_ZcRg--#WAPb8 zGxpn6OxykFarp3pJ%E*VpD-irP=y6+9Vwh~_<2w7*i>PYw7QZP@JY!@be=|7tRb3@ zyvqx-!{Jng11mHtJ=v%1dBEj*+WNGW^eN5Lg{@Aty6SUQi)MA>M{M;hSkKeFECv>4 zF`&fxy?D*8R{IuwUSdIB`c^H2ij+$gevG+>nTD&Re9o!j1y`D-Nr&q8v$M8`#Yh#; zyHa@5Zd{DGa#M77RTIAF3RQnTu0@-Xv$DrFyAi*3`8mUDF4b+|IRx=8Wstm-d7Q4Q zh23rZCTn|Ku6!h~XRVgONNr{B+^zb>EVucaIH8vPHvKLB`n( z=070n@UD9lSE{>3J>yaA33Q7nhH45ThN+s3{7hbCxdH$1bl_^hDH_ofESTcjEczRB zo8gQ^MH8+C3;0#QhLyG1nHn3i{;X($s3|yF%kJ8u#_u;^x8IHVnpV77+b2>u;?q*& zk)RD~C@b1<#9f{&gX5k8aOyn1(Q0 z*V3&kLD7?|sMmN^(V%g6(Wr4x(WG&2(X4S_(Zbw9D(;WQb(O>qK`bMxad#}iWqTsl zC2H^zYl8SoEY0>>Jhm*2OVM_ng~CYI$C*c!Eo)%U7JS%{ z*VR!grW-;y9`)cs_DXWhM%Jd-dn0?L@lliXYSX;-)_Y*6Z(y9!a__D0Ww~9;EN#o8 zGIIw~i9xQ9%sZXPi7w4|I^jVnA!EBWe~B+>E9pVJc~E4f|4dva?3DpCyzb|k<6Jjh zw*=Q1fW5GxZ)kY2+qA@P8F&ACQpP8eZPL033UEFIfO^j#9Ti2xMZ=)X{G;gq! zbR?qt{=MdxYm6jze}C{{@zswHzCRv*faiN^lk@9REKvoo=_g$n%Vm_kz4$|Zgdg?L z!1K*dkWFrkUaWGELVA)|@Evh4VTCQHT?07L-#V!}mh?t4(x`6L z!WQCQ4KLveUe#vX61I|+_T7}<#%noiU$R$HjF ziaeL1LemXuw2TA|@&@UKO`$t@dkaWM1%8(;AUz}fA~GhTt5{yl4nmMc~CvYdwUJaV|Y+~l4zJ84R$ zzj5713by3^;vyU?4rz7$-T&t^R~irsX7!$#Ld-AMDu0h;pU7jD$1X8)ieFqmx$dW8 zX2@q+uKX-}?W1AT4ozXY&(OwB+9Cfh&bs-MG-&*KSwwQE8mVDt#r1GmPlR>DA&d=M zP#m7c?C{V-1uaG^msa7zQF-L^CFYDZzJPDx|8mI1Tj=xv(Virc#Nsxr+=MGoH<(3n z<+IT*^P|3nfADs2e4a<~WZ+!GTW7elSU!`Me~4JIYWK|Q38RBmPYI4(J@@+RoWT65 zd_SwS>Pjw;Lw1k6(mdo2CM4iYk28@?xQB;qzY`Lp^RD(uiDV0|;x_$~)bcpN3b)jA z56HukpZ5&s>}1-?@1+bSnI>5yc^7rFCd)q3H^!rfyR(fS0%?;`1I#nj!FLbeS;n2* bm4h-Wz-)j)hWQ;#dzhwaj6*ZL(^virx)FHv delta 2434 zcmb7GeQaA-6+hR0_Ol(we$RgP^H=;4f5dT|&$?}#CY@`neo;lKm{91tEkUcGP}&U* zA=b6=kU$!&WA$&afyx&C;Hv^{RbYZhV?lIO`=d}$rLqY@5Sj!-qkyy`0joLpxsK8P z<38Pc?(dx6IX?H?ckgp^RWvV%r)EXw(%cmxa&XvA_up=}+p=egD8F{zc1oOIQd-Ih z-{1Z|`|5P#x)@}`hJr_wv$oVM{-vB1b$rHgT6pk|V_Uz2#4a{JQ=Kr>Fg)%EX51Q%xDvRn#_%KVZ@3KXbtUnr zD~x}*B51LUaQ}sxz@R&Z%dP;%Sbvi7MVGdA&>eP&5|(`?9_&|<()~dnXZ=oFBYIlb zpXqz1kCbsdXg$pYI zlQsT+Q#h>AV~x5TwNUq$uG0cfh77-JniFRrZ>qT%PKVd-fu?D zE@vxQx5Y8w*Gz=<2*+w`X4Ko|U8g0U#=5b>xJxsIA79eVV6e;i0Z(L8MsP_R;0Vua z`|wvifTEscbiZ!$_=>)d$5db#o0>D~V!BndE#LB;TvwP;<8rw$uA8_OhzvTID~Jm$ zon*6h*5#ndj^5h}8lIjVXM2;ycUE2c4&Y+xqk#ix^1tgsXuZ5NuU2Ha^cuBED&XBkRY zf%Gk`XNK@%W)~jMgn+@as z4fqX@!?5Qo%qg{oleji&U~IHt5AlINK2)>&sf?NY4&H}{@+IDf3;7(okK?VpOlv~A zJX$vJ21gCiBtnI{n3Br!kby50iej5p2#MZgRFS4;(ZKJ9io8v-MiNzv(t8J9F4kD? zgkGwPX-Sm{f4)={Ri-YoX$Hqe>bzIdQU2`qa#76UzVZ<gYabl_wQuV94t^`i zDLz0SrDOa&%m?mse4&h2->aXp^xvMrk=fn-=PEY(4_zb=vpo3b?A@4|%g!hyp1bGe zV=sMDEICO$_IUk-IQsUN-#nK32wR@GNBgjx+DT;3{d<0WzRlhq`r&pWFX8Q40m zY&WLy`rHC9>ZtWgjxsvYbo#dotZx5@a(v$uk zcJUQ+#n;1ba?^BQ2a`=+^ztT>O|H#l<2%Qir#njFr*|z2(H_gfXoV+&p=5N7HmY-a zU1TReAN(#-7%5xGLGL4Z`E~r9Y;$fQm65uIT#V%H*kQUE$&bMe=8IK4QHw_gSY_9( zXo7Tp9FDJY7JtP3^{;S2Kep$!4u!qAb(TZ)e^AnEeT_ee*4|u3e&YGt!`njC&s}0a zOIa+PdtmMG-WT}O?``c5s|DLnUaL787})>Cm%E<+~t1D zR^%>MdQ<`q`T!5|JvqT$;LQ9sY|I;3S-~lqpzS=4@_C$~F&@V(xsxg^C)V`FviL7( Cm?eJz diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls index cba4076e3a7f6224cc489dbd8e1322ad5148e84e..c2cbc441544c5e5f3f9b425f70ed86b61cad2ca8 100644 GIT binary patch delta 2776 zcmbVOdu*Fm6+id0<45B7`Ni*7;>2<6By-+%;&id&q-iARLi!kt5Q^3@R@Rn~ZAxLa z|L8!hFed-1Ez>%PG-(o>G_|CZRVs9wrXmn*tyHO1iJ*}NNE1@WL{$lB&AFfRklOx% zxYoVr{LcB^^WE>9``zo(q9~mZFJ?vKso~!U(Tp198DEr$?o=uj*<-A?tm9Kt`$bv* zO{=|>cs^CWCYsnWQiH?#BT6KTf9a2iC$LcS9Z`#$H9etv5;=O5o}_Qk0q)>q|*OmucdR!{o~xPOV(#tSUdR=3f_3;Jh;@CTb8587HeNq@F@M4dKT#{QQX2ni)nI2-*P4sT`I%mSRX^*m6w_(>}*fDGM_#Eq;;||C9$oUBA&DvZi4%$6F z*M|48$Ew}|&8y-g_8Ql{m$^*TA6SpyfQsEC+&ItiJ?os)tjMNMX%W2G=GZ2@xMB6U zylmFizrpb#XAR*Ehu3$nFSIuQyu*WWE9ctkt;XT;%6d%JBhEG)a)epi;q>tMb;e5? zE;>1PPD8JgNQRe9sb(Agb=R?S-cHuyW8Wc`BqFqf6 zC+JyOyp7htnxJ~Fh>o?|4LdQf<1VfnCmPcDRMq2R!;|=G)Xppaz@4t~@hk-gJw7-+ zF5ySqlNJH&@f1W5CwL4Y?(LO)l--T^sn;$dSacoLv?xw`kBdgeGpP5e@CRI)y@~BJ z81N6^RZlIHz!0u`^vDHvi59#ZDBuZiEqZj0s+aj`W!E1aLhR6K!}a zSik|l1^*6aL<+0Cl6IW-7eoj8LIu%@!=VEH7^uY_cMA4k5Wfp$L>H!Ay)r7^3|cU! zW^jY0uc1wQQZMx30v19R>=CA}t{r5a7TN(N1; zC8H)AN+wOZOJ$e0*Pr~^4;$oD#aH-jaShLEd z+0vY5dI%Sq(-@5P=*$#Bu`$6iik&S@rQ9~i_6H=t92;b68pCap+9j#D+Nff8W1Mlf_JFI6lHQ|*m%gW)WcXf` z+VY}Ln~_bbxY?Ev{mg%uxdR$kT2n2Oy9Eo$yvS(WYi!-uDx(i-(XS=5Ts^sT>Diu2 zh%Dw(d9L4T%frh*PhGb9bN%w0F^Fk;oc8f=p1SBc{+x^%EDgF94C0-^t@VAMDD)rt zJz1D*fo`Z{LM5?l`g1$}GE;ZBe&?qPri%ZI$ExA?G%b0e~D(z6|UZ$-R~TE zZtCnK3WGUODm;*+5%{zS9cv&E=t zBZarYvrJIt!bZ0-KO8IO__;*4wL?ZnIqkryB0c4KZR@@oMl~DAz(^i_Ri=@VJn*W>#7LfI zRb*yl-axgC2Vy{gOcQC@V2Z!2B( z4F$ic)Lvop$N1HQFL8cXw*J<2pJ@o@yyAc5M6oOP*7Bjreo@Xx5moeU@(+t#u*_*a zcZubtDYGjtM!pD0UV-XzF25|w1-CJ*oZi>={ZWJp$NJX_vR;^bCC_}f!b4TwsjBEK z`0&7(z4lI|YA3?fSQxWoW|YR3urxM4URaxRx4dPOD>c)5IijPTL=ua;u(E-%BNxQT z_=(sa{$vhtmKS*P2=~${|3~pF7lfw2|KlIHY>@fY z^Jb9QkooTB*nK>9@HgH~oji83Maq5}U`vKMlH1HZr{Pidk8vNM9-cYMwq9m$VLiVl b$0*}xqnx~jO+D-=uscn&jJmOR^45O=2(4jX delta 2393 zcmb7GYiu0V6+U-&cJ|?YjrTFL@2A(ZYsarRjvYU{DkjrzUYu zol>6v!W$)AQFl!cWvQ{SDA*63`nye>zIXqgehM@CU*x#r%;Q%s6=QBc-f?Ad))hvN z%fOFaNqF1_e$9Bz8OJN!@{GUa>c%wd{_2Xt;P!iGQgP8QZOaqxyhBuQ$gktL&xwo{ z2x%O|^+u5BNlkmI?Ws0Wdhs=X1~2#x%jROxjUQ;LXv49fj{E(FP;pJuJ$~kW){q_Q z{*s8`n!lG-3+=iHBH+`71A78l=)QmmON>wa?%)dTWk!PNwd^Wyza0w!z3DH;5j5ji z;hYe)wQQ`_gbP;#dd$Ll_uN4QeKxXsu-}8ABkPh{SG_aypoGIctan zM#Fs~iKF4;=!*wM3PoOfBHGU_C^Gm9YqQuBO<^<=5;^RN^ocy`ks7}^Z*pHmFi{g7 z@I(hKehItN&Dc9JY1{{=5ylgS7xPgaQ*i~~i5_6tR#9f{lXxrc#r4bx0tqkX5+kA; zD@ILhLM%3m_Y)pG8XFb8xDl&iKIz2==@DGuad&)#-@a4vn%IoD<25{%^5RF#-h!(f z%Mcz&)^KOqiziYeSWJ8EN50~ONDYY*IMX%6GhRH)o(}R@%8ZCH%w=l$n9S166UbKOp71GXG#I95ty%najtXUXp7=k|_*8B!=zS6Hu5xUO1u5v0voyOW|g zRV=nCq}T11+`#3ICjTX~lu#&EcUio6-C>Q1x|>HgCGl#`wC5;g*`FzeaZhInfx>3H zk23gEZh)(y=PO)^YJP|-@koAvEAf+jA9IS#nPs~UT(xk?^08PBqfwSIcj9=VB1}BP zeHoVugUqSmV%MxaLS5)CP1ys~jhlrbuE1ciB6@JJSY%!=E)-=X$CiilqBzZ%qcTVxR6)R>{3|o8|<<7Fn zHIlZAquoJPr4@0$w;27P2^%EkD4ZO zGjgvZ4^3Gsz02&ESxWffgl?oLK=wAvz2Iu_12d5{gl7--m}wDXVmu5z?BnKq^3_FT4mj9 z4W=~5jX;{Ird#^;@m2{o@a??+^2bwJMgMdOTW1W4&+K zkHS%IQZDBq+}!!F>f>2aAXnYB{Kl>^fgQU|)OUvqGEoE6M_ahx#P3!g^>E)~jazAu L$G+uU^}P5GkhdW6 diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - +