diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index ada02a4..1963de0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index ac2956f..cb6df3b 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs b/HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs index 3506d38..b166842 100644 --- a/HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs +++ b/HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs @@ -286,17 +286,24 @@ namespace BLL newPointBatchItem.WeldJointId = weldJointId; newPointBatchItem.WeldingDate = weldingDate; newPointBatchItem.IsCheckRepair = false; - if (rate.DetectionRateValue != 0) + if (ndttype.SysType == "射线检测") { - if (rate.DetectionRateValue == 5 || rate.DetectionRateValue == 10) + if (rate.DetectionRateValue != 0) { - newPointBatchItem.AcceptLevel = "Ⅲ"; - } - else - { - newPointBatchItem.AcceptLevel = "Ⅱ"; + if (rate.DetectionRateValue == 5 || rate.DetectionRateValue == 10) + { + newPointBatchItem.AcceptLevel = "Ⅲ"; + } + else + { + newPointBatchItem.AcceptLevel = "Ⅱ"; + } } } + else + { + newPointBatchItem.AcceptLevel = "Ⅰ"; + } newPointBatchItem.IsCompletedPoint = false; BLL.Batch_PointBatchItemService.AddPointBatchItem(newPointBatchItem); // 插入明细表 diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 8d0cdf2..0baedd9 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ProjectFiles - Debug|Any CPU + Release|Any CPU true diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index baa8804..8868ed3 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -51,7 +51,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs index d4ead77..925f145 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -126,6 +126,7 @@ namespace FineUIPro.Web.WelderManage { updateQue.ThicknessMax = 0; } + updateQue.IsHand=true; Funs.DB.SubmitChanges(); BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId); diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs index 5a73361..0f39950 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs @@ -375,7 +375,8 @@ namespace FineUIPro.Web.WelderManage { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID select x; + // 手动的不自动分析 IsHand==null + var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID && x.IsHand==null select x; if (que.Count() > 0) { foreach (var q in que) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs index 5dca815..e089d08 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs @@ -982,8 +982,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage sch = dn.First().XXS; } } - - d.Thickness = sch; + if (sch != null) + { + d.Thickness = sch; + } + else + { + errorInfos += (i + 2) + "行,美标壁厚[" + ansi + "]未设置值；"; + } + if (dia != null && sch != null) { diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 7de5b22..f4f47b8 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -1155,6 +1155,14 @@ namespace Model } } + public System.Data.Linq.Table View_PMIDetections + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_PTP_TestPackageAudit { get @@ -43287,6 +43295,249 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PMIDetections")] + public partial class View_PMIDetections + { + + private string _ProjectId; + + private string _InstallationId; + + private string _WorkAreaId; + + private string _UnitId; + + private string _PipelineId; + + private string _InstallationCode; + + private string _WorkAreaCode; + + private string _PipelineCode; + + private System.Nullable _PMINum; + + private double _RateBys; + + private System.Nullable _PMIBySNum; + + private double _RateByf; + + private System.Nullable _PMIByFNum; + + public View_PMIDetections() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectId", Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this._InstallationId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this._WorkAreaId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this._UnitId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string PipelineId + { + get + { + return this._PipelineId; + } + set + { + if ((this._PipelineId != value)) + { + this._PipelineId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationCode", DbType="NVarChar(50)")] + public string InstallationCode + { + get + { + return this._InstallationCode; + } + set + { + if ((this._InstallationCode != value)) + { + this._InstallationCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaCode", DbType="NVarChar(20)")] + public string WorkAreaCode + { + get + { + return this._WorkAreaCode; + } + set + { + if ((this._WorkAreaCode != value)) + { + this._WorkAreaCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] + public string PipelineCode + { + get + { + return this._PipelineCode; + } + set + { + if ((this._PipelineCode != value)) + { + this._PipelineCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMINum", DbType="Int")] + public System.Nullable PMINum + { + get + { + return this._PMINum; + } + set + { + if ((this._PMINum != value)) + { + this._PMINum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RateBys", DbType="Float NOT NULL")] + public double RateBys + { + get + { + return this._RateBys; + } + set + { + if ((this._RateBys != value)) + { + this._RateBys = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIBySNum", DbType="Int")] + public System.Nullable PMIBySNum + { + get + { + return this._PMIBySNum; + } + set + { + if ((this._PMIBySNum != value)) + { + this._PMIBySNum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RateByf", DbType="Float NOT NULL")] + public double RateByf + { + get + { + return this._RateByf; + } + set + { + if ((this._RateByf != value)) + { + this._RateByf = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIByFNum", DbType="Int")] + public System.Nullable PMIByFNum + { + get + { + return this._PMIByFNum; + } + set + { + if ((this._PMIByFNum != value)) + { + this._PMIByFNum = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PTP_TestPackageAudit")] public partial class View_PTP_TestPackageAudit { @@ -46405,6 +46656,8 @@ namespace Model private string _Remark; + private System.Nullable _IsHand; + private EntityRef _Welder_Welder; #region 可扩展性方法定义 @@ -46443,6 +46696,8 @@ namespace Model partial void OnIsPassChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnIsHandChanging(System.Nullable value); + partial void OnIsHandChanged(); #endregion public Welder_WelderQualify() @@ -46775,6 +47030,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHand", DbType="Bit")] + public System.Nullable IsHand + { + get + { + return this._IsHand; + } + set + { + if ((this._IsHand != value)) + { + this.OnIsHandChanging(value); + this.SendPropertyChanging(); + this._IsHand = value; + this.SendPropertyChanged("IsHand"); + this.OnIsHandChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Welder_WelderQualify_Welder_Welder", Storage="_Welder_Welder", ThisKey="WelderId", OtherKey="WelderId", IsForeignKey=true)] public Welder_Welder Welder_Welder { diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 6db81e9..33091aa 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 797f44e..1c046a3 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ