diff --git a/.gitignore b/.gitignore index a4b8d387..1ffcaf69 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /SGGL/FineUIPro.Web/File/Excel/Temp /SGGL/FineUIPro.Web/FileUpload/QRCodeFile /SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05 +/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05 diff --git a/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql b/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql new file mode 100644 index 00000000..32a54b0a --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql @@ -0,0 +1,2 @@ +alter table [dbo].[Comprehensive_InspectionEquipment] add Unit nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs index 9b1a20aa..aca4e48b 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs @@ -79,6 +79,7 @@ namespace BLL x.AttachUrl, x.Attribute, x.RemarkCode, + x.Unit, x.UsedPlace, x.EquipmentNO }; @@ -128,6 +129,7 @@ namespace BLL newInspectionEquipment.Specifications = inspectionEquipment.Specifications; newInspectionEquipment.Supplier = inspectionEquipment.Supplier; newInspectionEquipment.Counts = inspectionEquipment.Counts; + newInspectionEquipment.Unit = inspectionEquipment.Unit; newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount; newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult; newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate; @@ -163,6 +165,7 @@ namespace BLL newInspectionEquipment.Specifications = inspectionEquipment.Specifications; newInspectionEquipment.Supplier = inspectionEquipment.Supplier; newInspectionEquipment.Counts = inspectionEquipment.Counts; + newInspectionEquipment.Unit = inspectionEquipment.Unit; newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount; newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult; newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx index 5cffb821..20d6a9c5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx @@ -73,6 +73,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index 368b07c1..82481b82 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.Comprehensive /// public void BindGrid() { - string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications, + string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications,Unit, Supplier,Counts,SamplingCount,(CASE WHEN SamplingResult=1 THEN '合格' WHEN SamplingResult=0 THEN '不合格' ELSE '' END) AS SamplingResult, InspectionDate,AttachUrl,Attribute,RemarkCode,UsedPlace,EquipmentNO from Comprehensive_InspectionEquipment C left join Base_Unit U on C.UnitId=U.UnitId diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs index 4f71c503..0064f3ed 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs @@ -127,7 +127,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive conn.Close(); conn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 12); + AddDatasetToSQL(ds.Tables[0], 13); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -204,30 +204,30 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } - string row9 = pds.Rows[i][9].ToString().Trim(); - if (!string.IsNullOrEmpty(row9)) - { - if (row9 != "合格" && row9 != "不合格") - { - result += (i + 2).ToString() + "," + "本次抽检结果" + "," + "[" + row9 + "]错误！" + "|"; - } - } - - string row10 = pds.Rows[i][10].ToString(); + string row10 = pds.Rows[i][10].ToString().Trim(); if (!string.IsNullOrEmpty(row10)) { - try + if (row10 != "合格" && row10 != "不合格") { - DateTime date = Convert.ToDateTime(row10.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "报验日期" + "," + "[" + row10 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "本次抽检结果" + "," + "[" + row10 + "]错误！" + "|"; } } string row11 = pds.Rows[i][11].ToString(); - if (string.IsNullOrEmpty(row11)) + if (!string.IsNullOrEmpty(row11)) + { + try + { + DateTime date = Convert.ToDateTime(row11.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "报验日期" + "," + "[" + row11 + "]错误！" + "|"; + } + } + + string row12 = pds.Rows[i][12].ToString(); + if (string.IsNullOrEmpty(row12)) { result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; } @@ -347,7 +347,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive conn.Close(); conn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 12); + AddDatasetToSQL2(ds.Tables[0], 13); } catch (Exception ex) { @@ -411,14 +411,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.Specifications = pds.Rows[i][5].ToString().Trim(); Ins.Supplier = pds.Rows[i][6].ToString().Trim(); Ins.Counts = pds.Rows[i][7].ToString().Trim(); - Ins.SamplingCount = pds.Rows[i][8].ToString().Trim(); - Ins.SamplingResult = pds.Rows[i][9].ToString().Trim() == "合格" ? "1" : "2"; + Ins.Unit = pds.Rows[i][8].ToString().Trim(); + Ins.SamplingCount = pds.Rows[i][9].ToString().Trim(); + Ins.SamplingResult = pds.Rows[i][10].ToString().Trim() == "合格" ? "1" : "2"; - if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim())) { - Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); + Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); } - Ins.RemarkCode = pds.Rows[i][11].ToString().Trim(); + Ins.RemarkCode = pds.Rows[i][12].ToString().Trim(); Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 0f66f28d..cd74971b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -31,16 +31,17 @@ - + - + + - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 96a92eaf..240f921c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtCounts.Text = Convert.ToString(inspectionEquipment.Counts); } + this.txtUnit.Text = inspectionEquipment.Unit; if (inspectionEquipment.SamplingCount != null) { this.txtSamplingCount.Text = Convert.ToString(inspectionEquipment.SamplingCount); @@ -254,6 +255,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); + newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim(); @@ -378,6 +380,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); + newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); newInspectionEquipment.UsedPlace = this.txtUsedPlace.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 58934b6d..12391ea5 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; - + /// /// txtSupplier 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSupplier; - + /// /// txtCounts 控件。 /// @@ -112,7 +110,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtCounts; - + + /// + /// txtUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnit; + /// /// txtSamplingCount 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSamplingCount; - + /// /// drpSamplingResult 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSamplingResult; - + /// /// drpAttribute 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAttribute; - + /// /// txtInspectionDate 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInspectionDate; - + /// /// txtRemarkCode 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemarkCode; - + /// /// txtUsedPlace 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUsedPlace; - + /// /// Panel2 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -274,7 +281,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls index aeccac07..528af38d 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls differ diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0c6e832c..49d11d29 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -17051,7 +17051,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] public EntitySet Base_DesignProfessional { get @@ -18556,7 +18556,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { get @@ -88153,6 +88153,8 @@ namespace Model private string _AuditMan; + private string _Unit; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -88207,6 +88209,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnUnitChanging(string value); + partial void OnUnitChanged(); #endregion public Comprehensive_InspectionEquipment() @@ -88669,6 +88673,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")] + public string Unit + { + get + { + return this._Unit; + } + set + { + if ((this._Unit != value)) + { + this.OnUnitChanging(value); + this.SendPropertyChanging(); + this._Unit = value; + this.SendPropertyChanged("Unit"); + this.OnUnitChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionEquipment_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional {