From 7690087c95dacfd8d392a2dc76b7a3342d6fc141 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 26 May 2024 22:29:27 +0800 Subject: [PATCH] 11 --- HJGL/.vs/HJGL/config/applicationhost.config | 2 +- HJGL/.vs/HJGL/v17/.suo | Bin 1421824 -> 1421312 bytes .../Batch_PointBatchItemService.cs | 21 +- HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- HJGL/FineUIPro.Web/Web.config | 2 +- .../WelderManage/AnalysisEdit.aspx.cs | 1 + .../WelderManage/QualifiedProject.aspx.cs | 3 +- .../WeldingManage/WeldReport.aspx.cs | 11 +- HJGL/Model/Model.cs | 275 ++++++++++++++++++ HJGL/WebApi/WebApi.csproj.user | 2 +- .../WebApi.csproj.AssemblyReference.cache | Bin 43182 -> 32130 bytes 11 files changed, 305 insertions(+), 14 deletions(-) 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 ac2956f0c213e87db1251ab090d7aa9709798ae2..cb6df3b0431b7a3a52da90881d6a19cebf573c86 100644 GIT binary patch delta 14478 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 delta 15413 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 PalVG{W2@$Ww}|~G@CQ1Q 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 797f44e9cd4f3e1fd53fb0861232a6d2952f385d..1c046a323d7f485d5efaf038f4071e792611c332 100644 GIT binary patch delta 213 zcmZ2?k*Vo7;{;rtwV7gqO1Wex-tO3))V&!1^t3(Tk-kdAN%?M^JQ{n(KCMQpio*W>_ zGFd=tCRpWL?J6++T(=3V(A(gE9hfnrU=1&raiYG44a^AXILQfO09{uG76_Uq40i73 I_Sx#Z04b_Zp#T5? delta 1771 zcma)7O-vI}5O&uVEVTS96xwPaMkTr$kzYYYi(0gR6k{}!@LU#rVY^#*mr5@t{$2&= zq#le{6N#pJ@?iAp0ZmN28xJ1UctJ0|dF(4oCB`0_-M)F>eDlpW(;L5~#SilQ3IEIc z2h8yE(@Q@8!KGy*oZseOmJ`wj_L2PTD`=Qjnob%-G4xD1z8F)g=XnyJd5|$R!wes%97HJPF(u?AyW#Q30pZSC$n_u`pzd1-vrGVIt&%=JF_9 zKQjnFC+c9Rql;f1lTO0n_7oC;Vc!t6wW^$cwM*ojc1dAmU_#%=>3{7Q0ZjX1G|91( z>qR84)Qfx~*T5#u+z@h){1#9GWl8t_<{2i5mh*Mf(!BvmcbHm4lr=q%MI zm9q}jsY5ke$sSPlp;6YlYekddTgNSu)~=e?3|`oZz>UQrW5k|W1%)3e?x+0CP#J4j z?TYPLzdcR+CwrcxNhn1eQm9RdyZS2JWUTY`UKv~olIElaQhSeZ19!)R)(h)*3hi9n zt?Iy4L48}`Guy+LlY^{F1yDOCDar@>VP9#;GkbIAsv4*A!tsr8Bu zZ(4c_Q@Lc0->cdRpZ$Y;V8mKs4&im-!0f4Fi>id{ERGrU8vlBv(Uk;l4TCVRF>lr& zgHS3Nr)1hNZHKBhEX2A+{`~8zw}*Ik4>T|}MfUvN;lER_~~ zfO9Xr;2GKi;3xH6z#|cFP6YZp>q;4O+aWq@t^)H?kh`dQ)s2HG)uI_kDg!dm$ydp< z^c-J1m