From a3e123957d27e9a788bf1fafa40b235317baacb4 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 29 Apr 2024 19:13:54 +0800 Subject: [PATCH] =?UTF-8?q?20240429=20=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-29-bwj.sql | 48 +++++ .../ConTechnologyDisclosureService.cs | 1 + .../Comprehensive/TrainingRecordsService.cs | 1 + SGGL/BLL/Common/Const.cs | 27 +-- .../ConTechnologyDisclosure.aspx.cs | 13 +- .../ConTechnologyDisclosureDataIn.aspx.cs | 19 +- .../ConTechnologyDisclosureEdit.aspx | 1 + .../ConTechnologyDisclosureEdit.aspx.cs | 10 + ...nTechnologyDisclosureEdit.aspx.designer.cs | 9 + .../CQMS/Comprehensive/DataReceivingDoc.aspx | 2 +- .../Comprehensive/DataReceivingDoc.aspx.cs | 5 +- .../DataReceivingDocDataIn.aspx.cs | 21 +- .../Comprehensive/DataReceivingDocEdit.aspx | 3 +- .../DataReceivingDocEdit.aspx.cs | 6 +- .../DataReceivingDocEdit.aspx.designer.cs | 2 +- .../Comprehensive/InspectionEquipment.aspx | 2 +- .../Comprehensive/InspectionEquipment.aspx.cs | 21 +- .../InspectionEquipmentDataIn.aspx.cs | 45 +++-- .../InspectionEquipmentEdit.aspx | 2 +- .../InspectionEquipmentEdit.aspx.cs | 18 +- .../InspectionEquipmentEdit.aspx.designer.cs | 76 ++++---- .../Comprehensive/InspectionMachine.aspx.cs | 29 ++- .../InspectionMachineDataIn.aspx.cs | 57 ++++-- .../Comprehensive/InspectionMachineEdit.aspx | 1 + .../InspectionMachineEdit.aspx.cs | 17 +- .../InspectionMachineEdit.aspx.designer.cs | 9 + .../Comprehensive/InspectionPerson.aspx.cs | 57 ++++-- .../InspectionPersonDataIn.aspx.cs | 184 +++++++++++------- .../Comprehensive/InspectionPersonEdit.aspx | 3 +- .../InspectionPersonEdit.aspx.cs | 18 +- .../InspectionPersonEdit.aspx.designer.cs | 13 +- .../Comprehensive/TrainingRecords.aspx.cs | 13 +- .../TrainingRecordsDataIn.aspx.cs | 19 +- .../Comprehensive/TrainingRecordsEdit.aspx | 5 + .../Comprehensive/TrainingRecordsEdit.aspx.cs | 8 + .../TrainingRecordsEdit.aspx.designer.cs | 9 + .../File/Excel/CQMS/人员报验模板.xls | Bin 19456 -> 0 bytes .../File/Excel/CQMS/机具报验模板.xls | Bin 19456 -> 0 bytes .../Excel/CQMS/设备材料报验模板.xls | Bin 19456 -> 0 bytes .../Excel/DataIn/人员报验导入模板.xls | Bin 19968 -> 14848 bytes .../Excel/DataIn/培训记录导入模板.xls | Bin 19456 -> 14336 bytes .../施工技术交底管理导入模板.xls | Bin 19456 -> 14848 bytes .../Excel/DataIn/机具报验导入模板.xls | Bin 19968 -> 18432 bytes .../DataIn/设备材料报验导入模板.xls | Bin 27136 -> 14848 bytes ...料收发文登记记录导入模板.xls | Bin 22528 -> 15360 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/Model/Model.cs | 48 ++--- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 48 files changed, 560 insertions(+), 266 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-29-bwj.sql delete mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/人员报验模板.xls delete mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/机具报验模板.xls delete mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/设备材料报验模板.xls diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-29-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-29-bwj.sql new file mode 100644 index 00000000..eeb911f0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-29-bwj.sql @@ -0,0 +1,48 @@ +alter table Comprehensive_DataReceivingDoc alter column RemarkCode int +go + +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='ֽHRB400E' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='Y200430832' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='ȡͼ' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='Y1109024' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB8624-2014' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='CV' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB/T5574-2008' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='J1009194' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='B201031625' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB50264-2013' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='QC202108241813' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB8624-2016' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='Q355' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='A537CL2' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='EQ001' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB/T3880-2012' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='SS2022-00150' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='F1112193' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='AFJ2207444' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='A02212507RPS1' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='ֽHPB300' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='A537CL2/A516 Cr 60/Q370/Q345' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='J1012004' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='A537 CL2/Q370/Q345' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='SANS298-2007' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='SS2022-00006' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='jc/70-2002' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='AFJ22070445' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB8624-2015' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='8900002955433' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='GB8624-2013' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='Q370/Q345' +update Comprehensive_InspectionEquipment set RemarkCode = null where RemarkCode ='Y1201023' +go + +alter table Comprehensive_InspectionEquipment alter column RemarkCode int +go +alter table Comprehensive_InspectionPerson alter column RemarkCode int +go +alter table Comprehensive_InspectionMachine alter column RemarkCode int +go +alter table Comprehensive_TrainingRecords alter column RemarkCode int +go +alter table Comprehensive_ConTechnologyDisclosure alter column RemarkCode int +go \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs b/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs index 56bd5ce0..9a5326dc 100644 --- a/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs @@ -64,6 +64,7 @@ namespace BLL newCon.DisclosureDate = con.DisclosureDate; newCon.UnitWorkId = con.UnitWorkId; newCon.AttendMan = con.AttendMan; + newCon.RemarkCode = con.RemarkCode; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs b/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs index 1a13a283..feb9025d 100644 --- a/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs @@ -71,6 +71,7 @@ namespace BLL newTraining.Hours = trainingRecords.Hours; newTraining.KeynoteSpeaker = trainingRecords.KeynoteSpeaker; newTraining.Remark = trainingRecords.Remark; + newTraining.RemarkCode = trainingRecords.RemarkCode; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 976bce8e..762826be 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3306,32 +3306,7 @@ namespace BLL /// 质量专项检查模板文件原始虚拟路径 /// public const string JointCheckTempUrl = "File\\Excel\\CQMS\\质量专项检查模版.xls"; - - /// - /// 设备材料报验模板文件原始虚拟路径 - /// - public const string InspectionEquipmentTempUrl = "File\\Excel\\CQMS\\设备材料报验模板.xls"; - - /// - /// 人员报验模板文件原始虚拟路径 - /// - public const string InspectionPersonTempUrl = "File\\Excel\\CQMS\\人员报验模板.xls"; - - /// - /// 机具报验模板文件原始虚拟路径 - /// - public const string InspectionMachineTempUrl = "File\\Excel\\CQMS\\机具报验模板.xls"; - - /// - /// 培训记录模板文件原始虚拟路径 - /// - public const string TrainingRecordsTempUrl = "File\\Excel\\CQMS\\培训记录模板.xls"; - - /// - /// 施工技术交底模板文件原始虚拟路径 - /// - public const string ConTechnologyDisclosureTempUrl = "File\\Excel\\CQMS\\施工技术交底管理模板.xls"; - #endregion + #endregion #endregion #region 绩效考核模板文件路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index 7f8d0791..844a4050 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -239,7 +239,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = Const.ConTechnologyDisclosureTempUrl; + string initTemplatePath = Const.ConTechnologyDisclosureTemUrl; string uploadfilepath = string.Empty; string newUrl = string.Empty; uploadfilepath = rootPath + initTemplatePath; @@ -259,10 +259,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { lists = lists.Where(x => x.DisclosureCode.Contains(this.txtCode.Text.Trim())); } - lists = lists.OrderBy(x => x.UnitId); + lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - newUrl = uploadfilepath.Replace("施工技术交底管理模板.xls", "施工技术交底管理.xls"); + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理（"+projectName+DateTime.Now.ToString("yyyyMMdd")+"）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; @@ -297,7 +298,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); NPOI.SS.UserModel.ICell cell; - int i = 1; + int i = 2; foreach (var item in lists) { // 第二步：创建新数据行 @@ -350,6 +351,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cell = row.CreateCell(7); cell.CellStyle = cellStyle; cell.SetCellValue(item.AttendMan);//参加人员 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs index d043c7b8..b58b1674 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -246,6 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row8); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row8 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -395,13 +406,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_ConTechnologyDisclosure oldViewInfo = new Model.Comprehensive_ConTechnologyDisclosure(); string row0 = pds.Rows[i][0].ToString().Trim(); string row3 = pds.Rows[i][3].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][8].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][8].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -419,7 +430,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][6].ToString().Trim()); } des.AttendMan = pds.Rows[i][7].ToString().Trim(); - des.RemarkCode = pds.Rows[i][8].ToString().Trim(); + des.RemarkCode =Funs.GetNewInt( pds.Rows[i][8].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx index 7dc31553..e81ced90 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx @@ -36,6 +36,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs index 1e39d02c..de6eb01f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs @@ -64,6 +64,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitWorkIds.SelectedValueArray = con.UnitWorkId.Split(','); } this.txtAttendMan.Text = con.AttendMan; + this.txtRemarkCode.Text = con.RemarkCode.HasValue ? con.RemarkCode.ToString() : ""; } else { @@ -91,6 +92,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择交底负责单位！", MessageBoxIcon.Warning); return; } + + var q = Funs.DB.Comprehensive_ConTechnologyDisclosure.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.ConTechnologyDisclosureId != this.ConTechnologyDisclosureId || (this.ConTechnologyDisclosureId == null && x.ConTechnologyDisclosureId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } + Model.Comprehensive_ConTechnologyDisclosure newCon = new Model.Comprehensive_ConTechnologyDisclosure(); newCon.ProjectId = this.CurrUser.LoginProjectId; newCon.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; @@ -112,6 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } newCon.UnitWorkId = ids; newCon.AttendMan = this.txtAttendMan.Text.Trim(); + newCon.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs index 92dffb09..dd2561ad 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs @@ -102,6 +102,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.DropDownList drpUnitWorkIds; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// txtAttendMan 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx index 265b8472..1a926684 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index 8c7227fe..5e1bd28c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -54,7 +54,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive doc.CompileMan, doc.CompileDate, doc.Status, - cnp.ProfessionalName " + cnp.ProfessionalName, + doc.RemarkCode " + @" FROM Comprehensive_DataReceivingDoc AS doc" + @" LEFT JOIN Base_CNProfessional AS cnp ON cnp.CNProfessionalId = doc.CNProfessionalId" + @" WHERE doc.ProjectId = @ProjectId"; @@ -514,7 +515,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive cell = row.CreateCell(19); cell.CellStyle = cellStyle; - cell.SetCellValue(item.RemarkCode);//标志编号 + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 i++; } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs index 443dbc9c..fbe491e8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive where y.ProjectId == this.CurrUser.LoginProjectId select x; - var cns = from x in Funs.DB.Base_CNProfessional select x; + var cns = from x in Funs.DB.Base_CNProfessional select x; for (int i = 2; i < ir; i++) { @@ -276,7 +276,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "上报日期" + "," + "格式错误！" + "|"; } } - + string row10 = pds.Rows[i][10].ToString().Trim(); if (!string.IsNullOrEmpty(row10)) { @@ -355,7 +355,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row18 = pds.Rows[i][18].ToString().Trim(); if (!string.IsNullOrEmpty(row18)) - { + { if (row18 != "是" && row18 != "否") { result += (i + 2).ToString() + "," + "是否存档" + "," + "[" + row18 + "]错误！" + "|"; @@ -367,6 +367,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int c = Convert.ToInt32(row19); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row19 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -517,7 +528,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cn = cns.Where(y => y.ProfessionalName == pds.Rows[i][4].ToString().Trim()).FirstOrDefault(); var unit = units.Where(y => y.UnitName == pds.Rows[i][5].ToString().Trim()).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][19].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][19].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -569,7 +580,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.IsOnFile = false; } } - des.RemarkCode = pds.Rows[i][19].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][19].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; BLL.DataReceivingDocService.AddDataReceivingDoc(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx index 781bbfe9..5773e88a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx @@ -117,7 +117,8 @@ - + <%----%> + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs index 578a207b..ebe28ca5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs @@ -153,7 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.rblIsOnFile.SelectedValue = "false"; } } - this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode; + this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode.HasValue ? dataReceivingDoc.RemarkCode.ToString() : ""; //var currApprove = DataReceivingDocApproveService.GetCurrentApprove(dataReceivingDoc.DataReceivingDocId); //if (currApprove != null) @@ -212,7 +212,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } - var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.RemarkCode == this.txtRemarkCode.Text.Trim() && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null))); + var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null))); if (q != null) { Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); @@ -274,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { dataReceivingDoc.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue); } - dataReceivingDoc.RemarkCode = this.txtRemarkCode.Text.Trim(); + dataReceivingDoc.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) //{ // dataReceivingDoc.AuditMan = drpAudit.SelectedValue; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs index ca61470e..d14403cf 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs @@ -271,7 +271,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemarkCode; + protected global::FineUIPro.NumberBox txtRemarkCode; /// /// Label1 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx index 25ed15df..86852203 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index 7046a41d..fc883381 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -282,7 +282,7 @@ namespace FineUIPro.Web.Comprehensive protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = Const.InspectionEquipmentTempUrl; + string initTemplatePath = Const.InspectionEquipmentDataInUrl; string uploadfilepath = string.Empty; string newUrl = string.Empty; uploadfilepath = rootPath + initTemplatePath; @@ -306,10 +306,11 @@ namespace FineUIPro.Web.Comprehensive { lists = lists.Where(x => x.InspectionDate <= Funs.GetNewDateTime(txtEndTime.Text.Trim())); } - lists = lists.OrderBy(x => x.UnitId); + lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - newUrl = uploadfilepath.Replace("设备材料报验模板.xls", "设备材料报验.xls"); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; @@ -344,7 +345,7 @@ namespace FineUIPro.Web.Comprehensive NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); NPOI.SS.UserModel.ICell cell; - int i = 1; + int i = 2; foreach (var item in lists) { // 第二步：创建新数据行 @@ -360,10 +361,6 @@ namespace FineUIPro.Web.Comprehensive cell = row.CreateCell(2); cell.CellStyle = cellStyle; - cell.SetCellValue(item.EquipmentNO);//设备位号 - - cell = row.CreateCell(3); - cell.CellStyle = cellStyle; var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); if (cnp != null) { @@ -374,6 +371,10 @@ namespace FineUIPro.Web.Comprehensive cell.SetCellValue(string.Empty);//专业 } + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.EquipmentNO);//设备位号 + cell = row.CreateCell(4); cell.CellStyle = cellStyle; cell.SetCellValue(item.InspectionName);//名称 @@ -422,6 +423,10 @@ namespace FineUIPro.Web.Comprehensive cell.CellStyle = cellStyle; cell.SetCellValue(item.UsedPlace);//拟使用部位 + cell = row.CreateCell(13); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs index 14c8aaa7..95111f50 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 13); + AddDatasetToSQL(ds.Tables[0], 14); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_InspectionEquipment oldViewInfo = new Model.Comprehensive_InspectionEquipment(); string row0 = pds.Rows[i][0].ToString().Trim(); @@ -223,21 +223,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } - string row12 = pds.Rows[i][12].ToString(); - if (string.IsNullOrEmpty(row12)) + string row13 = pds.Rows[i][13].ToString(); + if (string.IsNullOrEmpty(row13)) { result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; } - //else - //{ - // var view = oldViewInfos.FirstOrDefault(x => x.RemarkCode == row12); - // if (view != null) - // { - // result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row12 + "]已存在！" + "|"; - // } - //} + else + { + try + { + int t = Convert.ToInt32(row13); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row13 + "]错误！" + "|"; + } + } } - else { result += (i + 2).ToString() + "," + "报验单位" + "," + "[" + row0 + "]不存在！" + "|"; @@ -349,7 +351,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 13); + AddDatasetToSQL2(ds.Tables[0], 14); } catch (Exception ex) { @@ -388,7 +390,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_InspectionEquipment oldViewInfo = new Model.Comprehensive_InspectionEquipment(); string row0 = pds.Rows[i][0].ToString().Trim(); @@ -396,7 +398,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (unitInfo != null && !string.IsNullOrEmpty(row0)) { oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId - && x.RemarkCode == pds.Rows[i][12].ToString().Trim() + && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null)//新增 { @@ -421,11 +423,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); } - Ins.RemarkCode = pds.Rows[i][12].ToString().Trim(); + Ins.UsedPlace = pds.Rows[i][12].ToString().Trim(); + Ins.RemarkCode =Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()); Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; - Ins.Status = BLL.Const.Comprehensive_Complete; + Ins.Status = BLL.Const.Comprehensive_Compile; BLL.InspectionEquipmentService.AddInspectionEquipment(Ins); } @@ -451,10 +454,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { oldViewInfo.InspectionDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); } - oldViewInfo.RemarkCode = pds.Rows[i][12].ToString().Trim(); + oldViewInfo.UsedPlace= pds.Rows[i][12].ToString().Trim(); + oldViewInfo.RemarkCode =Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()); oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; - oldViewInfo.Status = BLL.Const.Comprehensive_Complete; + oldViewInfo.Status = BLL.Const.Comprehensive_Compile; BLL.InspectionEquipmentService.UpdateInspectionEquipment(oldViewInfo); //result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|"; } @@ -476,7 +480,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 25506189..2e9ef024 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -65,7 +65,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 71cd5db1..246db3d7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -82,7 +82,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpSamplingResult.SelectedValue = inspectionEquipment.SamplingResult; } this.txtInspectionDate.Text = inspectionEquipment.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", inspectionEquipment.InspectionDate) : ""; - this.txtRemarkCode.Text = inspectionEquipment.RemarkCode; + this.txtRemarkCode.Text = inspectionEquipment.RemarkCode.HasValue ? inspectionEquipment.RemarkCode.ToString() : ""; this.txtEquipmentNo.Text = inspectionEquipment.EquipmentNO; this.txtUsedPlace.Text = inspectionEquipment.UsedPlace; var currApprove = InspectionEquipmentApproveService.GetCurrentApprove(inspectionEquipment.InspectionEquipmentId); @@ -243,6 +243,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment(); newInspectionEquipment.ProjectId = this.CurrUser.LoginProjectId; @@ -256,7 +262,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.Specifications = this.txtSpecifications.Text.Trim(); newInspectionEquipment.Supplier = this.txtSupplier.Text.Trim(); newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); - newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); + newInspectionEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); @@ -324,6 +330,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive return; } + var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment(); newInspectionEquipment.ProjectId = this.CurrUser.LoginProjectId; newInspectionEquipment.UnitId = this.drpUnitId.SelectedValue; @@ -336,7 +348,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.Specifications = this.txtSpecifications.Text.Trim(); newInspectionEquipment.Supplier = this.txtSupplier.Text.Trim(); newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); - newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); + newInspectionEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs index ba1f1314..3ca02d7a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class InspectionEquipmentEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class InspectionEquipmentEdit { + /// /// 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; - + /// /// drpUnitId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtInspectionCode 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtInspectionCode; - + /// /// txtEquipmentNo 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEquipmentNo; - + /// /// drpCNProfessionalId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtInspectionName 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtInspectionName; - + /// /// txtSpecifications 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSpecifications; - + /// /// drpEquipmentOrMatail 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpEquipmentOrMatail; - + /// /// txtSupplier 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSupplier; - + /// /// txtCounts 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtCounts; - + /// /// txtUnit 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnit; - + /// /// txtSamplingCount 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSamplingCount; - + /// /// drpSamplingResult 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSamplingResult; - + /// /// drpAttribute 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAttribute; - + /// /// txtInspectionDate 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInspectionDate; - + /// /// txtRemarkCode 控件。 /// @@ -174,8 +172,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemarkCode; - + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// txtUsedPlace 控件。 /// @@ -184,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUsedPlace; - + /// /// Panel2 控件。 /// @@ -193,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -202,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -211,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -220,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -229,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -238,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -247,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -256,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -265,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -274,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -283,7 +281,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -292,7 +290,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index 20e547d6..fd56334b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -305,7 +305,7 @@ namespace FineUIPro.Web.Comprehensive protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = Const.InspectionMachineTempUrl; + string initTemplatePath = Const.InspectionMachineDataInUrl; string uploadfilepath = string.Empty; string newUrl = string.Empty; uploadfilepath = rootPath + initTemplatePath; @@ -325,10 +325,11 @@ namespace FineUIPro.Web.Comprehensive { lists = lists.Where(x => x.InspectionType == this.sdrpType.SelectedValue); } - lists = lists.OrderBy(x => x.UnitId); + lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - newUrl = uploadfilepath.Replace("机具报验模板.xls", "机具报验.xls"); + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验（"+ projectName+DateTime.Now.ToString("yyyyMMdd")+ "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; @@ -363,7 +364,7 @@ namespace FineUIPro.Web.Comprehensive NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); NPOI.SS.UserModel.ICell cell; - int i = 1; + int i = 2; foreach (var item in lists) { // 第二步：创建新数据行 @@ -449,8 +450,28 @@ namespace FineUIPro.Web.Comprehensive cell = row.CreateCell(12); cell.CellStyle = cellStyle; + string isK = string.Empty; + if (item.IsCheckOK.HasValue)//校验合格 + { + if (item.IsCheckOK == true) + { + isK = "是"; + } + else if (item.IsCheckOK == false) + { + isK = "否"; + } + } + cell.SetCellValue(isK); + + cell = row.CreateCell(13); + cell.CellStyle = cellStyle; cell.SetCellValue(item.LeaveDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.LeaveDate) : "");//离场时间 + cell = row.CreateCell(14); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs index edb33d3f..06dba038 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 14); + AddDatasetToSQL(ds.Tables[0], 15); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine(); string row0 = pds.Rows[i][0].ToString().Trim(); @@ -269,20 +269,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row12 = pds.Rows[i][12].ToString(); if (!string.IsNullOrEmpty(row12)) { - try + if (row12 != "是" && row12 != "否") { - DateTime leaveDate = Convert.ToDateTime(row12); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "校验合格" + "," + "[" + row12 + "]错误！" + "|"; } } string row13 = pds.Rows[i][13].ToString(); - if (string.IsNullOrEmpty(row13)) + if (!string.IsNullOrEmpty(row13)) + { + try + { + DateTime leaveDate = Convert.ToDateTime(row13); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row13 + "]错误！" + "|"; + } + } + string row14 = pds.Rows[i][14].ToString(); + if (string.IsNullOrEmpty(row14)) { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row14); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|"; + } + } } else { @@ -393,7 +412,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 14); + AddDatasetToSQL2(ds.Tables[0], 15); } catch (Exception ex) { @@ -432,7 +451,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString().Trim(); var unitInfo = units.Where(y => y.UnitName == row0).FirstOrDefault(); @@ -440,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine(); oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId - && x.RemarkCode == pds.Rows[i][13].ToString().Trim()); + && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim())); if (oldViewInfo==null) { Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine(); @@ -482,11 +501,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.UnitsCount = Convert.ToInt32(pds.Rows[i][11].ToString().Trim()); } - if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + Ins.IsCheckOK = pds.Rows[i][12].ToString().Trim() == "是" ? true : false; + if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim())) { - Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); + Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][13].ToString().Trim()); } - Ins.RemarkCode = pds.Rows[i][13].ToString().Trim(); + Ins.RemarkCode =Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()); Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; @@ -533,11 +553,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { oldViewInfo.UnitsCount = Convert.ToInt32(pds.Rows[i][11].ToString().Trim()); } - if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + oldViewInfo.IsCheckOK = pds.Rows[i][12].ToString().Trim() == "是" ? true : false; + if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim())) { - oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); + oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][13].ToString().Trim()); } - oldViewInfo.RemarkCode = pds.Rows[i][13].ToString().Trim(); + oldViewInfo.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()); oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx index 1198ad9f..03eb4f74 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx @@ -89,6 +89,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index 6887a102..b2704742 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -93,6 +93,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { drpAudit.SelectedValue = inspectionMachine.AuditMan; } + this.txtRemarkCode.Text = inspectionMachine.RemarkCode.HasValue ? inspectionMachine.RemarkCode.ToString() : ""; var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId); if (currApprove != null) { //重新编制 编制人 可以 显示 提交 保存按钮 @@ -150,7 +151,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtSpecificationModel.Readonly = true; this.txtTestCycle.Readonly = true; this.txtUnitsCount.Readonly = true; - this.drpAudit.Readonly = true; + this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; } @@ -191,6 +193,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_InspectionMachine.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionMachineId != this.InspectionMachineId || (this.InspectionMachineId == null && x.InspectionMachineId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_InspectionMachine inspectionMachone = new Model.Comprehensive_InspectionMachine(); inspectionMachone.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -213,6 +221,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false; inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text); inspectionMachone.UnitsCount = Funs.GetNewInt(this.txtUnitsCount.Text.Trim()); + inspectionMachone.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) { inspectionMachone.AuditMan = drpAudit.SelectedValue; @@ -259,6 +268,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_InspectionMachine.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionMachineId != this.InspectionMachineId || (this.InspectionMachineId == null && x.InspectionMachineId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_InspectionMachine inspectionMachone = new Model.Comprehensive_InspectionMachine(); inspectionMachone.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs index 95b5c957..b118bc06 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs @@ -192,6 +192,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// drpAudit 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index 7a66fa66..72302fe0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -372,7 +372,7 @@ namespace FineUIPro.Web.Comprehensive protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = Const.InspectionPersonTempUrl; + string initTemplatePath = Const.InspectionPersonDataInUrl; string uploadfilepath = string.Empty; string newUrl = string.Empty; uploadfilepath = rootPath + initTemplatePath; @@ -392,10 +392,11 @@ namespace FineUIPro.Web.Comprehensive { lists = lists.Where(x => x.PersonName.Contains(this.stxtPersonName.Text.Trim())); } - lists = lists.OrderBy(x => x.UnitId); + lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - newUrl = uploadfilepath.Replace("人员报验模板.xls", "人员报验.xls"); + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; @@ -430,7 +431,7 @@ namespace FineUIPro.Web.Comprehensive NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); NPOI.SS.UserModel.ICell cell; - int i = 1; + int i = 2; foreach (var item in lists) { // 第二步：创建新数据行 @@ -446,6 +447,10 @@ namespace FineUIPro.Web.Comprehensive cell = row.CreateCell(2); cell.CellStyle = cellStyle; + cell.SetCellValue(item.PersonName);//姓名 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; string proName = string.Empty; var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); if (cnp != null) @@ -454,7 +459,7 @@ namespace FineUIPro.Web.Comprehensive } cell.SetCellValue(proName);//专业 - cell = row.CreateCell(3); + cell = row.CreateCell(4); cell.CellStyle = cellStyle; string unitWork = string.Empty; if (!string.IsNullOrEmpty(item.UnitWorkId)) @@ -463,23 +468,19 @@ namespace FineUIPro.Web.Comprehensive } cell.SetCellValue(unitWork);//单位工程名称 - cell = row.CreateCell(4); + cell = row.CreateCell(5); cell.CellStyle = cellStyle; string postName = string.Empty; if (!string.IsNullOrEmpty(item.PostId)) { var post = BLL.PostService.GetPostById(item.PostId); - if (post!=null) + if (post != null) { postName = post.PostName; } } cell.SetCellValue(postName);//工种 - cell = row.CreateCell(5); - cell.CellStyle = cellStyle; - cell.SetCellValue(item.PersonName);//姓名 - cell = row.CreateCell(6); cell.CellStyle = cellStyle; cell.SetCellValue(item.CertificateNumber);//证书编号 @@ -498,8 +499,42 @@ namespace FineUIPro.Web.Comprehensive cell = row.CreateCell(10); cell.CellStyle = cellStyle; + string isO = string.Empty; + if (item.IsOnSite == true)//是否在场 + { + isO = "是"; + } + else + { + isO = "否"; + } + cell.SetCellValue(isO); + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + string isT = string.Empty; + if (item.IsTrain == true)//是否培训 + { + isT = "是"; + } + else + { + isT = "否"; + } + cell.SetCellValue(isT); + + cell = row.CreateCell(12); + cell.CellStyle = cellStyle; cell.SetCellValue(item.DepartureTime.HasValue ? string.Format("{0:yyyy-MM-dd}", item.DepartureTime) : "");//离场时间 + cell = row.CreateCell(13); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Remark);//备注 + + cell = row.CreateCell(14); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs index 3062cee1..54d9d3d5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 13); + AddDatasetToSQL(ds.Tables[0], 15); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -172,28 +172,21 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; 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; + var posts = from x in Funs.DB.Base_Post select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_InspectionPerson oldViewInfo = new Model.Comprehensive_InspectionPerson(); string row0 = pds.Rows[i][0].ToString().Trim(); var unitInfo = units.Where(y => y.UnitName == row0).FirstOrDefault(); if (unitInfo != null && !string.IsNullOrEmpty(row0)) { - /*oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId - && x.PersonName == pds.Rows[i][2].ToString().Trim() - && x.InspectionPersonCode == pds.Rows[i][1].ToString().Trim() - ).FirstOrDefault(); - if (oldViewInfo == null) - { - - - } - else - { - result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位人员报验编号已存在！" + "|"; - }*/ string row1 = pds.Rows[i][1].ToString(); if (string.IsNullOrEmpty(row1)) { @@ -219,23 +212,24 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row4 = pds.Rows[i][4].ToString(); if (!string.IsNullOrEmpty(row4)) { - var post = posts.Where(x => x.PostName == row4.Trim()).FirstOrDefault(); - if (post == null) + string[] reunit = row4.Split(','); + foreach (string unitWork in reunit) { - 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 row7 = pds.Rows[i][7].ToString(); - if (!string.IsNullOrEmpty(row7)) + string row5 = pds.Rows[i][5].ToString(); + if (!string.IsNullOrEmpty(row5)) { - try + var post = posts.Where(x => x.PostName == row5.Trim()).FirstOrDefault(); + if (post == null) { - DateTime date = Convert.ToDateTime(row7.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "有效期" + "," + "[" + row7 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "工种" + "," + "[" + row5 + "]不存在！" + "|"; } } @@ -248,36 +242,69 @@ namespace FineUIPro.Web.CQMS.Comprehensive } catch (Exception) { - result += (i + 2).ToString() + "," + "批准时间" + "," + "[" + row8 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "有效期" + "," + "[" + row8 + "]错误！" + "|"; } } - string row9 = pds.Rows[i][9].ToString().Trim(); + string row9 = pds.Rows[i][9].ToString(); if (!string.IsNullOrEmpty(row9)) - { - if (row9 != "是" && row9 != "否") - { - result += (i + 2).ToString() + "," + "是否在场" + "," + "[" + row9 + "]错误！" + "|"; - } - } - - string row10 = pds.Rows[i][10].ToString(); - if (!string.IsNullOrEmpty(row10)) { try { - DateTime date = Convert.ToDateTime(row10.Trim()); + DateTime date = Convert.ToDateTime(row9.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row10 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "批准时间" + "," + "[" + row9 + "]错误！" + "|"; } } + + string row10 = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(row10)) + { + if (row10 != "是" && row10 != "否") + { + result += (i + 2).ToString() + "," + "是否在场" + "," + "[" + row10 + "]错误！" + "|"; + } + } + + string row11 = pds.Rows[i][11].ToString().Trim(); + if (!string.IsNullOrEmpty(row11)) + { + if (row11 != "是" && row11 != "否") + { + result += (i + 2).ToString() + "," + "培训" + "," + "[" + row11 + "]错误！" + "|"; + } + } + string row12 = pds.Rows[i][12].ToString(); - if (string.IsNullOrEmpty(row12)) + if (!string.IsNullOrEmpty(row12)) + { + try + { + DateTime date = Convert.ToDateTime(row12.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|"; + } + } + string row14 = pds.Rows[i][14].ToString(); + if (string.IsNullOrEmpty(row14)) { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row14); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|"; + } + } } else { @@ -388,7 +415,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 13); + AddDatasetToSQL2(ds.Tables[0], 15); } catch (Exception ex) { @@ -426,9 +453,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; 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; + var posts = from x in Funs.DB.Base_Post select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_InspectionPerson oldViewInfo = new Model.Comprehensive_InspectionPerson(); string row0 = pds.Rows[i][0].ToString().Trim(); @@ -436,7 +469,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (unitInfo != null && !string.IsNullOrEmpty(row0)) { oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId - && x.RemarkCode == pds.Rows[i][12].ToString().Trim() + && x.RemarkCode == Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -450,37 +483,37 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][3].ToString().Trim()).CNProfessionalId; } - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) { - Ins.PostId = Funs.DB.Base_Post.First(e => e.PostName == pds.Rows[i][4].ToString().Trim()).PostId; + Ins.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][4].ToString().Trim()); } - - Ins.CertificateNumber = pds.Rows[i][5].ToString().Trim(); - Ins.QualifiedProjectCode = pds.Rows[i][6].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) { - Ins.ValidityDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim()); + Ins.PostId = Funs.DB.Base_Post.First(e => e.PostName == pds.Rows[i][5].ToString().Trim()).PostId; } - + Ins.CertificateNumber = pds.Rows[i][6].ToString().Trim(); + Ins.QualifiedProjectCode = pds.Rows[i][7].ToString().Trim(); if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - Ins.ApprovalTime = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); + Ins.ValidityDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); } - Ins.IsOnSite = pds.Rows[i][9].ToString().Trim() == "是" ? true : false; - - if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) { - Ins.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); + Ins.ApprovalTime = Convert.ToDateTime(pds.Rows[i][9].ToString().Trim()); } - Ins.Remark = pds.Rows[i][11].ToString().Trim(); - Ins.RemarkCode = pds.Rows[i][12].ToString().Trim(); + Ins.IsOnSite = pds.Rows[i][10].ToString().Trim() == "是" ? true : false; + Ins.IsTrain= pds.Rows[i][11].ToString().Trim() == "是" ? true : false; + if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + { + Ins.DepartureTime = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); + } + Ins.Remark = pds.Rows[i][13].ToString().Trim(); + Ins.RemarkCode =Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()); Ins.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; Ins.Status = BLL.Const.Comprehensive_Compile; - Ins.IsTrain = true; BLL.InspectionPersonService.AddInspectionPerson(Ins); if (pds.Rows[i][4].ToString().Trim() == "焊工") { @@ -510,36 +543,37 @@ namespace FineUIPro.Web.CQMS.Comprehensive { oldViewInfo.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][3].ToString().Trim()).CNProfessionalId; } - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) { - oldViewInfo.PostId = Funs.DB.Base_Post.First(e => e.PostName == pds.Rows[i][4].ToString().Trim()).PostId; + oldViewInfo.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][4].ToString().Trim()); } - - oldViewInfo.CertificateNumber = pds.Rows[i][5].ToString().Trim(); - oldViewInfo.QualifiedProjectCode = pds.Rows[i][6].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) { - oldViewInfo.ValidityDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim()); + oldViewInfo.PostId = Funs.DB.Base_Post.First(e => e.PostName == pds.Rows[i][5].ToString().Trim()).PostId; } - + oldViewInfo.CertificateNumber = pds.Rows[i][6].ToString().Trim(); + oldViewInfo.QualifiedProjectCode = pds.Rows[i][7].ToString().Trim(); if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - oldViewInfo.ApprovalTime = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); + oldViewInfo.ValidityDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); } - oldViewInfo.IsOnSite = pds.Rows[i][9].ToString().Trim() == "是" ? true : false; - - if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) { - oldViewInfo.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); + oldViewInfo.ApprovalTime = Convert.ToDateTime(pds.Rows[i][9].ToString().Trim()); } - oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim(); - oldViewInfo.RemarkCode= pds.Rows[i][12].ToString().Trim(); + oldViewInfo.IsOnSite = pds.Rows[i][10].ToString().Trim() == "是" ? true : false; + oldViewInfo.IsTrain = pds.Rows[i][11].ToString().Trim() == "是" ? true : false; + if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + { + oldViewInfo.DepartureTime = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); + } + oldViewInfo.Remark = pds.Rows[i][13].ToString().Trim(); + oldViewInfo.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()); + oldViewInfo.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; oldViewInfo.Status = BLL.Const.Comprehensive_Compile; - oldViewInfo.IsTrain = true; BLL.InspectionPersonService.UpdateInspectionPerson(oldViewInfo); if (pds.Rows[i][4].ToString().Trim() == "焊工") { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx index fa368162..26ea9876 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx @@ -72,7 +72,7 @@ - + @@ -86,6 +86,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index 7e54e94c..da1ef2b6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -106,6 +106,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitWorkIds.SelectedValueArray = inspectionPerson.UnitWorkId.Split(','); } this.txtRemark.Text = inspectionPerson.Remark; + this.txtRemarkCode.Text = inspectionPerson.RemarkCode.HasValue ? inspectionPerson.RemarkCode.ToString() : ""; var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId); @@ -172,7 +173,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtValidityDate.Readonly = true; this.drpPostId.Readonly = true; this.drpAudit.Readonly = true; - this.drpUnitWorkIds.Readonly = true; + this.drpUnitWorkIds.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; } @@ -223,6 +225,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive return; } } + var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } // 焊工部分 Model.BS_Welder welder = new Model.BS_Welder(); if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -307,6 +315,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString()); } inspectionPerson.Remark = this.txtRemark.Text.Trim(); + inspectionPerson.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); string ids = string.Empty; var lists = this.drpUnitWorkIds.SelectedValueArray; foreach (var item in lists) @@ -401,6 +410,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive return; } } + var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } // 焊工部分 Model.BS_Welder welder = new Model.BS_Welder(); if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -486,6 +501,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString()); } inspectionPerson.Remark = this.txtRemark.Text.Trim(); + inspectionPerson.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); string ids = string.Empty; var lists = this.drpUnitWorkIds.SelectedValueArray; foreach (var item in lists) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs index ac1a1a4a..2a6a02b2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs @@ -166,13 +166,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive { protected global::FineUIPro.RadioButtonList rblIsTrain; /// - /// txtRemark 控件。 + /// txtRemarkCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemark; + protected global::FineUIPro.NumberBox txtRemarkCode; /// /// Panel2 控件。 @@ -201,6 +201,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + /// /// drpAudit 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs index c1afab99..c5f50b58 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs @@ -212,7 +212,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = Const.TrainingRecordsTempUrl; + string initTemplatePath = Const.CQMS_TrainingRecordsTemplateUrl; string uploadfilepath = string.Empty; string newUrl = string.Empty; uploadfilepath = rootPath + initTemplatePath; @@ -228,9 +228,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { lists = lists.Where(x => x.TrainingContents.Contains(this.txtTrainingContents.Text.Trim())); } + lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - newUrl = uploadfilepath.Replace("培训记录模板.xls", "培训记录.xls"); + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("培训记录导入模板", "培训记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; @@ -265,7 +267,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); NPOI.SS.UserModel.ICell cell; - int i = 1; + int i = 2; foreach (var item in lists) { // 第二步：创建新数据行 @@ -304,6 +306,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive cell = row.CreateCell(6); cell.CellStyle = cellStyle; cell.SetCellValue(item.Remark);//备注 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs index 5c10af82..fabcf77b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs @@ -165,7 +165,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -217,6 +217,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row7); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row7 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -356,13 +367,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_TrainingRecords oldViewInfo = new Model.Comprehensive_TrainingRecords(); string row1 = pds.Rows[i][1].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][7].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][7].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -379,7 +390,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } des.KeynoteSpeaker = pds.Rows[i][5].ToString().Trim(); des.Remark = pds.Rows[i][6].ToString().Trim(); - des.RemarkCode = pds.Rows[i][7].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][7].ToString().Trim()); BLL.TrainingRecordsService.AddTrainingRecords(des); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx index 8218aa47..c8fd2d66 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx @@ -42,6 +42,11 @@ + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs index ca55ca85..39e9e0dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs @@ -50,6 +50,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtHours.Text = trainingRecords.Hours.HasValue ? trainingRecords.Hours.ToString() : ""; this.txtKeynoteSpeaker.Text = trainingRecords.KeynoteSpeaker; this.txtRemark.Text = trainingRecords.Remark; + this.txtRemarkCode.Text = trainingRecords.RemarkCode.HasValue ? trainingRecords.RemarkCode.ToString() : ""; } } } @@ -68,6 +69,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.TrainingRecordsId != this.TrainingRecordsId || (this.TrainingRecordsId == null && x.TrainingRecordsId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_TrainingRecords trainingRecords = new Model.Comprehensive_TrainingRecords(); trainingRecords.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; trainingRecords.TrainingContents = this.txtTrainingContents.Text.Trim(); @@ -76,6 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive trainingRecords.Hours = Funs.GetNewDecimal(this.txtHours.Text.Trim()); trainingRecords.KeynoteSpeaker = this.txtKeynoteSpeaker.Text.Trim(); trainingRecords.Remark = this.txtRemark.Text.Trim(); + trainingRecords.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.TrainingRecordsId)) { trainingRecords.TrainingRecordsId = this.TrainingRecordsId; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs index 0ea812a2..35c6c856 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.TextBox txtKeynoteSpeaker; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/人员报验模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/人员报验模板.xls deleted file mode 100644 index 6d470aaf12720240545a14739c55ec5ec4ee97ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 F{Tr16hqV9z diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/机具报验模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/机具报验模板.xls deleted file mode 100644 index bc98e10fcc6857191b73dcac3b50bf6f8733f958..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls index 4fb6a79a582e79d1b732df4a42c9dc45d26dd509..ebd30f0592e7e19847c8286ebc8d16618f3e2078 100644 GIT binary patch delta 3277 zcmb7H2~-qE8vd)N=bm8>ftf)@29QHVkV_6xKyKH73I=37@z#wRgCZg}h>9SJ&>qqC zz$=L-tB5EDMFoj&G!LV}V?EGS)Lp~iu^wUVRLwA=QQy9;e%)2ye^mY7UsLa|$=Qf< z(pQBb&4K<62-&fGDpCH1<2dr_0HABd3hFCVGS=IofK#j_XIOo55`Ne3TTf;Y0vjb-``?C~#Xjof!u} z#&Otk7zm9caL?zr*v$``8rq&XI+)tCAfddN1Ai4PJkXeveES5=STDe^7<7n^b^M5z47E~f|gPuI(1e6N# zREXi~zyY)4<9JEP9Su=DnlBKF#1bhss8j-lcsz>c@%c2~6O@hhK&$v_NAGY!m!ac? zPG4I4qrvAb{D>_uXUtwyV}b8&TZ@6prGzi&WbP;f+KRCG*i+@Qpy z;h!g`j7Vk1PnbAq@|3C5zDl1nH)CGr{Jh0WmgX-jC@f`HuUWh9>-8J9ZQrr;n{U6{ zwfkVjp~}NmM~+sXI$c+Prs0RP=Pv$y>GCg4SFT=bzH|4V_wKhmc=)L8$wzU(51bS` z`wlbOq|I)W*mn18c4;HzOx!+B?T^eBeT*9OKe@f7*2(M|$an~EAWsFM@L*w&_L#Qh zoafi)?cJAtHU0XLs)+85L1X`ZdY5DEUBj~nm%UDHS+3dae|e@~&7`ieo@>2(S6#il zI(Vg4|6?YjqsJf4?lt|cYr)h#?Lj9>@251EHfZ|9w(#cNo!Kr@m(4F3<27&Q$Roz4 zWqbXXk6i!7L`7BL%^Kap#p+Ny_-)bmS@mxWFL%xqgdA z=Pzwf_%`*dPn64z8$ZNum7UD+?Ya=oLq>3Dy+gs_Yll+(-{e$fRQxTazJB|u({4JK zS$$u)>H9UEh`PUQ)u3}1zvz0dh|0P>;dYYU=uIly!#7eQ_}3*C9gw&4$VH3FnYQp$5tICz8T1X6+$YEc+~h(jU} zK|9!C8DJ@Z5Kwiz0aB6-urtj7MH|@j{Q|vg0S!<5EaBcL>3n&TF;m3Zjp!L~k^CwC z*&6pb_685o8&fV?KTCb=gECrj{3UXx^;Ym%4~0eY3ZZ@C26p&|Az zazMfOeTUA-LSu>73>tiTFJDa`&rkqeW#WCGxV3L=VZ2pK=% zkvhSrOkXoX7?DZMh{A}h zYeqbX#M!bSn!ylPm(3E?tvXh ziV@jjvrdLBwM}f>0hgX*qe;Se~0lv;!d(4DcdNzrq`%Autuj*3=xcEAiQhClc?<4UM*M+M;0iYQt|`K_Rbz?7(uCNH!{-gtW&=X~*cV}P8>{sg zR*UX+>^?EIf(j;7N|#1<*OI*;{|HFlNw!JI1hXNO7QHzzbPpB>(!QksE*UsT<&D$Q}eQeQxRL%y)#;|3ymd%Mh%D<3||9Y?k;ue(-N*9n*P=wf% T0|!;q4GKYQZCu#F!L{gjv}B%K literal 19968 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 KpsxR);eP;Hm*O7) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xls index 57e6721b7566bde011aa49fd29e9093b24c50199..969e47a4da30f3d32b7228267b5d1865d736987b 100644 GIT binary patch delta 2815 zcmb7G2~<=^7Jb$IyMH%ZFCg83NV5qVHyV&dga+AkW<*5;GOnn&O~g1TB0_^`5JVKd ziAz*mV-%GjQA7nAfe@V}9vu+HF@j7)%@7)m5e?zz{om@GV?1ZhRGq3<@4i=6@BaFy zUS;hfSu3{(5!>?dO@!DnB00Yf_TQ z>c?Ac7@1sUO~1A_!+f1)4Dv8AQ{^gVid;-=nVrgEOcsvROs+f%`)hI)_FepVw1OK) zDLC9TKE{uGc$`*pc#M+sDO0MLOywBU2*dFL0vIg?pws9y+>UihTRj-~utdCB2@s@E zyfX8+7y~7Mxc|Fw{Pu6*G`|kwZ>_@-e%Ct8FG__FW2kuKyv>|R3S6hvV`uhW!Y2A{l_OO2oSvJvm{b3j!SCaq~^dI8)YoCm_c8 z=s68&<4lwyQJ4L?fTbb*v2y|irR!tLwz1%gI5+EcIS}b+9EsQ;JlR`pJIE(RPK*RX z2+YF@>>Zc@60w*TizGBnOQjMs3mZ!db8`zjrL|0N<7n?R#L<56V2#@-4~@$R*TI85 z{f3Pg^MSbJ%bn-?4uF0f7_3BO;@sCr*l; zKI8qk_?Zd%1q&A?Enc#8+22!EuSs2-wk~JmrjK$r=j9hOJ3jto=dRs*4jn#n^s{51 zA3t%X;>)w=D$iG4xLn`R_*K)_SFYapXLHNV)?2sRI_`J=`-cZz4<9}5ee(3@XTLn} zd-0MZMnGud^@iG8#1wjDCZH%GMRUxEAQhWXL5ZBb#LCdA^!yL4U9{N}o3NsT<#ke5 z?`g(CiL0)g*}D03xc748cy8~e_BOK(@1myvpWNP1`!BOLun-bFK%oLc;9=&l{;1x# ztY>%Do;;OuJLS&#$_Z}Q1Lpms{wy5^|wj}#hCpkoq`owEwnK=;_AGJ6St0Q2aFlLPtNJ@9`@Lt265kctzFYF%Wxt0 zqyCs<30Jfc?sxBg9evQEF4fy16TXGiz>r3#ymM_|Cio6yRi;*a5#QK&_;S66o%_nM z&pjN+wbn*F*t~tx)f*o;TrCi!w=Zm;Za-&V@{vbtF04M(U3o4qu^^okW<0(NX>`-C zRVCrqed2c=XdbPvNxi0?0(A4DIu^28i`LIDF6;CAN|wCbVbrH78{^M+&D+ z5AVvQVS7OUy|;TvE({^5Wy}29g7+PbS($Jx=4tSE`^NU@16HIzeG&K91AXdy>qqvg z^2_{k#0}+FG>)fh7Ni$A9=;d+aU}~Dz4v=wuy9@9(_h=a;zC(o;HLdsI~@Hww&m(B zHm?Z!d|_em38DB!wcQpPioM;hx`L6*9Z(^r17C zd=Ho9_IrQ!$gECZb7e)5w^e~*eN%6MZ>dg{7Poo8qG{;Km#rIpm!>#I#M8Y(+p`$j4kPtpDr=nGf&wj{&Q>hh&_d6 z8t0zHYS-~=Mos?L^8kQ&N1refS{xp81ezrn~xd5*+ffd?O@Vx|ki2zdtCm~wM zNga{#7{UmX=S1!&}U zGHF88FsxS^1rdOG=9MObNZ_)t$y1CPmrG3=4N({#Kr8k&C~aUU{0E+Z3(MD1b#k0wF@~bhC1}?~|RwS;HU!H1IspajO?h*tqaHoe2`C$w2wkQc@gl zYaS_>nW1xt#x>ar=kVW%=~qD4eilI-pDL5 m*l)mxD&rEhzc@NYjE@&6Ak4wgNfiyzL4+|x>CQ|tklz7DR$dSQ literal 19456 zcmeHP2Urxzwyqflm{E|70!mg85Eu~wQG$qB6ythD1qDP!K}7_Wg;fv(YXBo+7BQ?j z=PU+r6~*i>m{w&~bXQpn%sZ!>o@r*fXVts!y>IW`nyvFHN0M^8C@LagBi<25pwjH1B>ZvSzABMW>2UG1RWG{B3%Yl6o* z*9I>JF9BZHvw-6 z-U>Xn8}zntZ_kSVjm-DASG6~ZgI@yl-YU1;qDYO{I2tp9E7UPwW6V#P- zqyzd|*?CjXw1syBHV_TKh6Zi`d$plsg-Y9X4k2~rZsNVp%1 z0zA&Kw*1(4KR18u&qcL(5;62*ElqM*w^;jRnt*6Q=PxHhvO{zdu7o@QA4cM#-wOgs zB&azO)EP-8P)!9D#OkyD>s@OCH0c%Z|8!wm2I+hmU>YBEGE`9;{&LX8 z<k7 z2G+I|`9RAw=N3`45k6sGXq^_y!i>_~xzee0-ocQwwK{Qi8YqCusCg$LZ)G?iB_zN) zz#5(z)<_pXoTC4ZDd^PGabV`+=c6Mc7yo}UT|mwIYwawg?Ma}KQ+D{HuKfx0JZ`## zhu)lr?!-yQRSIK&cD>`ug^Mn)mplUl)B2|MiO8I4C%DSt;>Vd17adnaTy$I^QS|Es zT44YzfN1;Rs)>t^D=8Ko7EUz3oDS`lT`pX8QTz)H43^Yi0{XjA`eVyy=*O*&TM?0j zqT}j}q0{^{9an5LJvy4^_oDc56-UvplW@ov7H+gYxFW2jM+8{A%gco;K8n7lR!@-= zg@dcWy7U$l9an~R>CO}#SBrJ&?i3x!N^~o=bXA;2Jov46aOn1+nlEiwweD>5FrfNN z?YKnKp&2XDweXRQ`x0&I@?$&a$Ek}yRcuVA;y@#J!9?m)7M~(+K~n0_kwFM6C}V1s zh|eU(HGr9PJ&p4hOa2rfvlho8yZF!qu8;ofaY#P%h*fge1uxau(QM6260ccNb zcmDo~a$0RIDl27OM=5`Qf4Kmo6r08<#ilVzv1yD_Z{EC-<0+I<rj&L}5zoE4tfC!k3d(6b zMQm0FL{_K@l1H@u48)->NJXApfN7R_QGcq5qa1|KCcq$fJjH1a3>siiG;Cz_R~pud z1ya=gD?yxDAW{!55P4bPhNn0#ED-v*g%M%~btaA>4@e70QrM(+E1i;KKt7|fxw1ft zx_>2z8w*70!39F8ReRwnjyns4K7L|^nBp*T40%ALkfg8)&g2-!fP98cT7nD%Qq=t` zK|EL>QV%W=Ml%d~iqnb(LLbL5LQHX(IEFkRo{+>8Co)=_CBcAvhD}!cvZ}INmG}`goENVv57WG32p{4gHyCIBYKt97Jejvku6m|bf5Puek)PoCz z(G0`d;waBFahpUj)8tTHSs*|zK+OvNeDWXor2_5c0{AHW43&buRG@=gfU^uaLU>@M z5m~m_oMf}w8k}Crgv5KunOPuDkV`*JLx!P2nurPw(=@5jC{2qBjnlNL&?HSvg{El| z2qm!j3`c5DV=pdH$wF8UvcMEN3tiZB77;=8oUVN{qg+O0i!JMFB&;tJ5hj%ukx<8e z0_~WkOI6S{^Z*@GXjVN~*J~2N!&w&>IE2&q)=K!EGEJgLXOyx)r4Yv&b_Z0H($EK` zm{dlju|lLJhlqh(1fMHtU0rwqLY|8UhlrtE1fL?bh^0cL6^DqCTm+vPC?bK^E1)iN z=0%07SW9RO*1{Bq)tY8~&%tU!vA&nH+92ziIZLLfqM8CLrqHN*#1`w|M9kw6{rUuj zwvEXaE7w6or~^ehBW8zUH4F2H^NBSAF-1C4276SjQ><^eieegOpctmmtlFe0bUs1K zz-)0NFeMUcClHv+1SDl3#&U$(q#3fk9IVP_0c> z1P)-tM9^laMpkCjfI)dn$4{f1S+lxoh?>a6M45|*uz?es21L*j4*!}GYdA);R$3i{+6hFKvIcO5$1j0=IYJva=>zCiY8X|atpHk`1Ox4i(5=4++8UtMNzl+HaJryk zQ#63GO>IFefvQ3+-*pwO3ZQ!*CwKhdKWt%#wwW$KSwR)R!K|8CpsRG(dy-m5GUDVo?fi@xD zsy6lHuxSewo8qE~9`tTSve?WWeI3TR*THsykLS8G!S+Jv-K zwP|Y(n@Uw|ifcsLrtQ?*6ycO@+ET4e70`a_ZOR4hq1L7fXn*xK<$`Xd)}}P{aIq;F z&Uzl3Qf9)-V)1jG#jF&h_3EY}!V_mgGD98&V8}S!Lr92;8WZKl&x2>rG>?MQ7-(V& zZFKTt(-er!29HMqY)A9f5Lw(HWi z!|zB?o_S#5>XKD=Z$5rF-Rttt#-+=<=?-+s)7G6GRqQ%*f8|t{0*j4zIyXM+5?fwq z^5j`kqYHb!H~P8D`3a#ZcBS((w(h-eePge4sm&{w`$G=ek7_rk(}1Vfs+vCtu5fNv zPw4$gfCW^jo&NrV&L6O=bPSGX(0D3pOHtt$1B>Tbcp4wKd+nd~3g_XcW)?&JkLMf{zG|1Y4qU-4?NG8Z5jPXw@~L%{TqKWkF4D5Ikn(lBm4O_ z7&3iW*OF)EZDwEG8{*li;e6@3%pplf`#iVYGvN&hh?$pR?*^m5u4tY z{`P7}yHxWdlWQJ*EZ_ZGrvFO+$q6-;+UqVEwC(WhjOoujbyo zhOKLsyz;N9F8J|dfaBWyV7FsQZz^^>xE=fWXn&m5lrrtcy0J;C?7tCtRSt}w)3j`P zgRId$mX$Yio)*sZHgwdwZ&}*J%=d)FgbpbOnk7!3lo=$e6l^bk>AUaUFu$BL9>2Zy z9+y^_b+y^UpGeq%2?GsY{#Y_Ab-ds1ar^b#ye+=pepAk!%P!Nmb(!ikNSavGc8%kr zm}z}nG~RySL;5ah(mZ{KZH1BNmxT{EyJr_@WDwW+ePo&b$mR*14bNY?H^O@Toms`N zSFFCU@yCkReiIk;(w{jw>(%h*>95UmyDa>p@4L|UFVd`R%syoOT3mhQ+{E8eH`h(;kPrvZgr`8*D>CrO~IIwZ0qNjvZjnr*7e9de$=Ol-4BO# z5+)W5b+EsG=SZ>6t2>EyZOhIKYMbd?JlW`F>aDeRV-~Lr-#Ghi)8~UTzrDHU^!{T( zaho5f9&>XWBuyB(*R0juF-NOIK2CWhU9-pG7h@~Q(NCs3-e(dKRPLa)QZ?-ZBJSS?bcl!Iy*R|Vp8#}k~Nz%a01J=bzzw^sJl|K2(ZRnW(Q}$Nw{~<5z?SLYS@{A)BpY&^+HsRLh zR~sJubnC&X*HNyU-}c_yIr!Q5$RR@`d7FwMp`&N$THGvr(f*>vfvW6|SECk1Uo+6mE{u(w(QWemi=($K9pw9@ zXvb3*=S?l1Ej77RK1_Q5RN|%0!80S??%&!nPju%*QdURrszA^9hZ-)gyII+mZaw06 zVDyozn-{qz3KJI&5bnz>lJ*#QM7%!g&iLz|W6G`LPwH+TeP`c`!mjqC>hEb@a(&uyMtw0!)2N$w5rxz+EadUV#j>~N- z6W#LX2f3|FA?1##F}4!#e@JM>7etLxepOD*y{?{i;ds5kR=&m+CJwU4}dLBFJH z@ZDC!>{AOCj2n8>YUxU|vew@RAi5 zjE1-TNgA`+T-@f_qH(z=#~k=|Za{C-kXg5VBX@*Pn;Yl#!eqpPZjL>g+4pvIl`b9M zz@ckS-j&&XtJAi5ubbEZk?pz-f#(lj>0C82W%cXjf~jZij}FtHQcBDg_sW&+{^V^w zYlNGX>EN2szzMfAG#%HTD=M>FzPY>T;-Eu^&iq_=T4DWzeaRnC*2b_^Y6Rh+pt!LK zQDYN^_DznDnlKpW6k8Wu3OVhrA6(V>zR&s%iOGmedAM=Q?;oBtKV0f0?WHl@ z;fLP^IYVwPY54ewzI*d$8~Q$5>2uF4Cw89Q`g_{;oA&t4J+bTi6_RlO)j<;m8+)Cb zJk0)b(#0zitJ7M(WqZrqr{;a*^s6;HUUhewcV>HqldN4u)(>%mM(li@=zG!njnA7$ z?;W0a%+KBRL~wgyE~|p#I8m=l=OzFJzJ8y zn95xbf zLJtm-5P?yMd5CV`%H(=PEIT`N^fwaNx~I~s2SsGn-ntJs7_SYR;B($ZA)8*cFj2y0^7~n1E0p~;7P^Jp{A)-eP|@(5Z#dC1-b(z@M<22k#HzCHfA(G{f(D? zoo~GALnmh(mZvH7D^swEE^cUpq!7MK(WCAS;ELaRipj@KuS*YU`qB~J^XX-kQ zqNGu!rcs;XaT94I_zqG|QVTj0h)<`u)2VAS;Etx;6MqNRJ?@j!?x}xs*8LhdQ;>jG zurCik)QJ!e%3bqkLIKHxO|?7*fQG4aRdn!vfFUL+l$GFnRSPVwh>9bAf{r2%`}ic- zL=o43W6q~Wins{mh(r&=`9Qmsaa0|>UB zg;XH}1bXBXRgZ)OP$_gwKmtKeQky1(G-RjKG$4lOjC4#y+M|ZGF-;N#`Y|yrh+&7N zIkia#(2bCrKud=ZzTOfVl6?pahy<)pyE)LG=di3C33)ex_M$;|4Z4a5S%xY}Mu;1d z5iDkCVECezMhA7RleR%^c2w*9Z)=%M%V2C!TNhL`0Iq*p7qlQYYn#{(P%u+PFAkNQp@7fU#H;+HJ=%|5Jj%jA@H#D ztC7F1T9=MU$X8><9m>;D9{Kn}C3#Xt^Z$p1A7ykoSs~RPn0SYk*l143s`PMdkdTvs zgrviJr5G0|#f7Xmy*dOD%E0xg5eQ=nhvQON#;P~fJ!AB@ED#fChuyc`ftCjz$0tmu zrtpNM1;9OyRh_}39%0~doQeTY?SMdtW84lH;BcH00W+2haR$JeU@SaKli@x9JSjQ( z=~Vh{0p6#%j;8*v0(o()>j7(w;qZ3{aq#yCaquq<^uJ~#0WAtvDPQNXfpL`|^%a&D zm*%-z=;thf^1D=Tg9#JSRH9`84a<#VH`>GzJh(Kp6^_|xBh)B*A}o|Z%JI?ieG$V*qV3&1>fRDUVHFT_?sCitcJWGts`6mq1C$s lr4@uN!TZ29hrvD}*=-OFLI?<7 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 K836Pj82$$_f0zsa diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls index 8d33ec9e48e50f42a79c62b4eea146582bfa96de..57d5dc569d1ffd158db37e28753d110a50fecd5e 100644 GIT binary patch delta 5169 zcmb7I2|QI@*Wc&PhI`#>o?TO@OgA!g4Vig7hA2{GD3T;S#tc_cX5mz#fuddwPe@TD z3W;WskVZN$iXb#pgeoN? z07r;ELmEw?lVoJ(^v^;9YlH!X$t zX5!&^HA~$$RgwFT{JxF1gLXlrKvZIh9W9jc<%#cKMyfJpa zR&?@GI-0UWtvHI;*xK})SE8%K?zD_Egjf#GL~{Dv=q`(fth%*nLGQLDs?@o4?5c3C zpD)3%TqIhwGE409;$XI&sNa_g(JfK9twBEhl`Hn|kuGSP6ctY$7<{HLP~GfXIqGre zpu=HVTo>6%%ddUsy%MX83$K^`rJy=6emFh0Kr1m#X4a_(rf{VEv|;?7Mq8`TFHwUE&(uABTlM?~>BIwv*N9DHXK$ zTJ#0Ua&pcXVu@%Ks*OKqw+D$^PRB6RRb4LPS(z0hr0{^XiMLB|HQg0kKiIT5&R;UE zp|xG6=FZeqyKB`N_Jm(^+}5erU*43jaaFP~Px|oNvFoA_?K|7V6F;^V@e?PDCnsyi z)^NDa^2CSRuUyw8e{El5VIJ8MYb;yLRnDy8ZWA--+Xc(ilj zqRu66hwP5~eNCiWC&UR&;(R>VRY?S|g<{K<`yR63(K7=3@khVk#92m%aG%iWf?623q^7_W&zCD{q*+3Sss!jDh;Ol##r5N4}`9>l%N^D7xuPk_;aK0 z61HK(!rohq(CZY{p^d6%L!zi+48h1l2Ty!t2XiilpBl{0_j#%1_570FjrG3qsDxCm z;Wh0)@V`4BE6a@S9^b#8>QD@hDsY4wW8-o>t|=T|QJ3NJgu5W0y`L);uy?mmzqLx2 z{AovxpwxX1H_V)#=2h)nvvb?L66>?!=cvrI$@}LQ-|6}qEKeAsu@rYjGH+JPX?NZ0 zU!a$Gl_PPh%7^#VU%fM!{?}6RLvgC6&tmBn-sQ_ZXu_E(s)u}D-pp?~zSePVHgDB@ zXOq#Aj_s!DXJTybQC>*2t4#=>K7P@_zIl(i-lO;Wsn*n@=Q}nVxD)S3oml?+^%DjC z)pa9>v@6&l`7e(I`gU(9CE{C8T;a64>D&}7b)RIts1rK9%12}O za-6*1)NS|Z+wOGXdy)rN9@EP93iXbRd9I0x5nr7XY7m{Q?Cjw zPtIR;%V)i;)LW;~(4@$KM|#zF@yuO{2VUG-AM=X2EY4%4R=29R_+`#X&3$65X4PxD zR!^U>jg5Ov;}uEu5^j_jwDC6FFRRPnU`H& zf4%I)l@IDpkvDNu8+v(##GZ}r?4_3z^S9(!F#;Ag=CG1g1;(u_^V)4w3~!yzhPL~A#yOjT_?cK%8=ySDD3{ga_&(UIDwywa9~CdE}Nl=NxCJ_4=tt<6Hu z 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 JVARXq>wow}P>cWo diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls index 39a206c2fc1a0e8a5b5daac867ec06129924ee62..9d1883b42e308afe00776b58f78c5b8c3f00ff81 100644 GIT binary patch literal 14848 zcmeHO33yahmOiic%0g1v$U>4z0wh2Z$eyqzEMc35C}9@_0wIYg&=@um35&8MA_2Nt z8d+4j+oeHVKu{nN5Mi_(6dJ*{1!)DHK?3Rknx^JI_vNLMs`pAVGvCaI?XB-_|2^m2 zbI)Dgz4yKPw-0RRx9<+WKrXH)>FKt^N~R{bgfx5M{E1p4!TH+`heHO5ko?8nMHcu6 zbPY%6>ER9VMtJUXGrR@f3hxE)4etZ*3*QRf4<18+Z14f_f$%}_!SEsQJSNzOAsx{q ze;1kNpF-84G#$TkvQs`yLp+n_p||ebgGh}DQ_XaB!PWP^gAP@{Btg6>HX z#)_~NLW%YYo^t|8!TR-A&|7FVcPKpp%U0f3SfJpJh5vKB6p}6U7OU+)E}wCC`Anayst-|y25!~BGc@Ge zG;n_nJWvC-y5LcUPMGC^B*oGfj#!GLMEE%BLfuG4#!^xfG|G^H2XLqw`F%8$iZKbt zX)tEtsU7Cdn2fr#YLm;N481TcqqJE)*Q^LBqmGnH(s;5rDA*AxXL}j%M$Jo`w_S}Q z7S@RsTrzK-NJkk)QV0A*Wm?rRu2lh-X^EbPF6ye?4!OB%x;C#&n@+Ac7em@9MQK+F zb)potcDagkZ=D*2r>Z(*E(en|mfAM!r4Hz&v6KMc6dwy~M;UT3GQ-tboMS|bxf@1j zge$Y6w0f;_sa$tHYPNe~_oRVS(0Q>>CHmgM`&Y%)*cq3Q75H~|hVw$MMz4jlR5kja zGcJj90=JNzY-hqC7k0QQqfR_g1Gj469W?NcsyLr!)a=hE95tM^6ZmGEEyO#-n+)M% zobV1xjh;_PYB-;o)NnpY3H%h@gCq`0vVHh;)da_ZO2&D_HsE$7p@s|YGH&^FCg|7M zZ0o((L;ub~e?GA(_@U@S(PXd+oKJBIF4N06pX_9O$`qMCOVIOaPvEC$0+KjL%KGrh zu>qe*l-bxWJ{b!9H6+*>Itn>_lh7Pb5;&g}n&X`W&Zo-ec&5MsyWkNTc(jI`5Dh#` zLykNi-0PL??5<~|hWyqolrP)OUA~t7TK19c;I6-x94$OWL;sfAKT*RzvfbSEY^nX_ zeqlKhpA;G&0rI%zL#e=d;0Y(=d?O<8Y@035Zoy&ePH;>I7kaaX9G)*~@@3pzPNSaL zXaFDmn(5O(Z;SBMwYZjmMAAnx(Z8RBTIS% ziLn7LRUX6>7+VTg2C$dyVK5reIFE0R)iife~n zOM-VLTw~#3$mFt<3{j3&IE-m?Fx^^R432CNo$i6qU34@=d*V<;cVf|*EfQ^qXiprn z=wKYs+-%AQaJ6ZSn@yGZ7y~nUv?+^owP~zJn>s}&d$y^X=s1ryb&Brn*`{iu+j_LA zB03oT&GXj7-?G|x6w6P@7E zri$obOcOVo@=ES%(++MnRaW#E+;4fbDT{NpX-AJXb&AgPY*RJSojlsqDLTuuP1Qsv zdbFt`I+(KEZJMEC(WX7K7E7QGzLHf3?HHcj?uQ>W;zo^7foy0b@{Iz@N$Y*RJS zT|C-U5gkn3-EEqwV$&2in`SoJw1;P#vN%_prh2rgQ*=+yHdPay=Fz53(Yc;&swO(! zqfKSelPn=Lsmb#=M3{+#D!g#1YEr`3D$6K%PRVXHA{&0g@CvAi9>k?@A>Opi6RE-C z3b;(XG|IuPK^e`)JDBn&6u$yiLZ!e`@GPAm@nzKGxZLUy!_rMsAJpf^;mpE% zF(3Oj@UAYJq`HaV8%pN7(TI)4OW}{?l;zeJ-rrUC;-dw-o^ntIaOPLswtkUyNxwE~?&ciR-<)HhAdCy0&RWGZ$OELRyE0g|}-TpU|OW zdPZhec23tmee?VEA24uG;jrN&MvfXiX42&1DJ7+44?J8xYxbPE^B!5U^zkQ_Enl&6 z&DwRp`R)1*8#g`k>~lMQ|A#+5|H3P;zV`Z_y>IN>|MuY{N8dU2?(q{Jest>eU(S4d z_S}WfFaG_DFE3sG>g#LQzy0p}|GaVY)(_k+iS%-_8e8VlE*sjVGZ^#+Gq+39&4Jh3 z491ugQ$VkK%@cne7@NAt64bkT`|et6T-wmO;G&r)y+YciUubuYng~D(*RJpR^x62;^JwIsQ|8V-GPY*_vM1^b{xIfvYJR&?AJ%S0=8gEsZf6eVf4O}1pc5ZH z6mg>zONi_pB(YnlG(d@b#xO&wT91eOvpUOdqvj+o{e6 z=X?-)51CID*E*=;O!cF~>mIn7^^V{4sS(M)D_=Zy=)mmAu$l9h{9wEP(zRC)&k4V} z=-}z%u=xj4CzfyT|6ZXXJ9?3?gQS|&-bmrBZY4g9mHS)e~H$y*rH0fIFmAkT* zn2zi|Zjan~aMJv$$Y($6`J25C^11f;)msiax$tWJq55h2cdh99_?9OxL}p!hYFXZ! zr>1rP^uw8@8D-^>`74U5 z17eF7WS-yF<5=9el?l3aTUy;bIzROFH?O_EboQ0Q2ljQcM;$FH+#7(Pq*<-GjgvRxlojl~PH*(_twlYEg<}(N!XZw(M9bb4Y!Yh8V9FqL8Lf1%n zNIS5UTc{q>m2afkdy{mq(oW{lcDkp;P8*Buw4=yQRd^^!JBq3{4KEyAkU&SrPaV~P zw-gM8EWA;uKvt3hhlCID9acBb3kPGF4m12hFFGm zFZFTw4&hh`WX--PjxK?~&x#fnB+RIDt)9rAv)@8}NXz=u$N z)Wt4;2*s}qBtQ0~tLe*W5r zgNyFT9WU^X0`DZk#R91SjpEwzbsmLEi%?Q);JSk0mk8>mB5V)pDZ+i38{Z_&_YktX zoXee~q_^YF#tN-)?}49=-o-CXxQ}v`Sfb51v}{(G8hD#V{OUt?!y&^$3&iJQMESAY zT7$^5d`fZVaZf_6{hWC{KJTdXcjgV?JK5QpH{z10b(k}6A`>OYIrC<`0Kbg=hEg97 z-u=eB#=I5nylirod!a|i*_?TA4DXZP&b$xWkniKn`=S@eHRww^etAQX&5qL+oqU_z zie~5;%fqB$j33^u@DYlF{X=|EM})}+caZD|CFIn915hV(u$0~+lyegHE-X^c>8LMk zr{whbq=`p~TxP&mSlALZty z2`1;fLCO6u=X{Xk7hZDCmj(*!oPp#hG$IJMQvX5Mc@ETl4JwTPIv!TsmIx^ANBX)C zk@h2l*eyzAt&{Bvu!+-=m*C@ua_g9W6XI74GS0GC;U!qyCLpXW?t7V&Hsh(wqV)FPh9}*;ZCAF`0kv5tHjBn zvdIjb4Ejj6m(0dfms1-NUbcMEFl3m~mr5+H;W;fkEJggWn7*(4ai{t^*4*m6j{UQ( zVagm=%+}B|BAbWsCwoR_#3&F>?wMcuBJHExmOoGaKl-Af-+s;!k4;`R_~F4TCNHJD z^6*1}7Yu#?@UqX}ayR|{oAbOt*x-5D3xroTBV6{2yE`nvOFurX_1mO7&0Q|~{71hL zy36l9`R*Y8q8J0Drs1pV|Ld6b5j&nci9ypuzuQee1aE?~B&NHKyA`##v7GstPAhid zr}HxX&n&KQcy!5ejic`t9war6dWYQppNx$xz)63@kJk_@)%GG{+HFPAliqjx%9@2U66}!VfXn*D% ziPKaZEB*_?w7iZE78}f&xXOJPehRjl{Ev*e*mM@-+E-qm5xF_7_OpJv)9;_&oE+i5 zc0Jmkcxz{0U`7|rh=ap))WZKkU~Ty#xh4Nc$c81Fu5@k+ssMbCuv{^gN_k76me$`= z`9DQ}H`iZ<#_>GBP!{7iL2hgX&lNu4WyACM%!79w^IXnOiR+Q({R2DZ=PoYi42J%r z2$-Me67Mx$ZpbsnbLd|%?h0_s;u$a*BajbUy%CpT^iRf1g<_PjQ}!tXar_;DysJ(; zpLnkFrw15SDcJy8i-5lvIHL literal 27136 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls index 9646a912ba8051a22f703a3e31d23a0368bc0a45..b8ab3ffe66463956887d54cdfb03ca180b76522f 100644 GIT binary patch delta 1529 zcma)+U1$_n6vxk|BCrQ=a)Y@pJiRM8qO*L_|`OtO@yVgdEq#}taZBhIH zjjbCgrBK^MJpq+IXrJ1bHqkAVzL@l(^eKW;DD)wOg7{PjhFX-y?YT3P9aj+KazB3O zf9^f^dvuD8o;=^i>aM@>8)GkERCq^wT&YxeZUBIlhXm5sW9~lJ`&HcFUqH)9YXm|d^W}auO-hg1v9#XtMxi`DQ~7cq`!tg={o+PH{sv9 z%uMdVEYuCB-li!3R1AO#)11ysXF!y*^N@lRZYOm`RUI1g)h(Wy#=}MnbMUI+*mcW3 zKLWI8+p{3Piq{PX=ZzR^zs=aAQ)^xC@Z;GDG) zZy6S5ZHLy^=ar+j(+e}+MB)^j0d3V*)9``^cIg>*GLt_oH*1={KTg?BgnE?^t{GQx z{`Ha8%Z=PC#)>cugOrZLCislDP&;jguLc-MVgpRX%5H|n%v5k7$g)dD!3AxFrbmqLyLZI=^r4B|C9--c!- z)Mb$2wi>cRbI8|+tb$sCb5>|b&?NT9Le@a586XMC8eIn+@-K$|{7jCEA)83byt zRU?jgs#PL6`NSZ3@I&#=JG|S;0}JGp<7eRwz)vj)u_{G~_(StOMI!#Ze2NmuRf-YO zB@DDUQAw?$1f4Y7Wl<*5s-zGltE3XqV+w{z5YbBtNF$;%2q;NpRY@n}ADTZkgDAz{ zp^qjZ|Id7~h|*QEp$mnc4fF#y_w1r_q~~iY)4gtzZzF%b5pP4wM|;OaTzGTs4L2>Q y+k~<29(>ge^jVi1`<57X6%2F>QjlfoamMSt2L}oVaH{aV*tRP1uza9+Rs0|K02|H# literal 22528 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 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 c7deac87..cb214cc8 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -87250,7 +87250,7 @@ namespace Model private System.Nullable _CompileDate; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -87288,7 +87288,7 @@ namespace Model partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); partial void OnCompileDateChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -87557,8 +87557,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -89539,7 +89539,7 @@ namespace Model private string _AuditMan; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -89603,7 +89603,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -90128,8 +90128,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -93788,7 +93788,7 @@ namespace Model private string _EquipmentNO; - private string _RemarkCode; + private System.Nullable _RemarkCode; private string _UsedPlace; @@ -93844,7 +93844,7 @@ namespace Model partial void OnCompileDateChanged(); partial void OnEquipmentNOChanging(string value); partial void OnEquipmentNOChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); partial void OnUsedPlaceChanging(string value); partial void OnUsedPlaceChanged(); @@ -94200,8 +94200,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -94765,7 +94765,7 @@ namespace Model private string _AuditMan; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -94819,7 +94819,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -95263,8 +95263,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -95708,7 +95708,7 @@ namespace Model private string _AuditMan; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_Post; @@ -95770,7 +95770,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -96222,8 +96222,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -102801,7 +102801,7 @@ namespace Model private string _Remark; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -102829,7 +102829,7 @@ namespace Model partial void OnKeynoteSpeakerChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -103028,8 +103028,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { 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