shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-05-26 22:29:27 +08:00
parent aec61bcebf
commit 7690087c95
11 changed files with 305 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

7
HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs
View File

@ -286,6 +286,8 @@ namespace BLL
newPointBatchItem.WeldJointId = weldJointId;
newPointBatchItem.WeldingDate = weldingDate;
newPointBatchItem.IsCheckRepair = false;
if (ndttype.SysType == "射线检测")
{
if (rate.DetectionRateValue != 0)
{
if (rate.DetectionRateValue == 5 || rate.DetectionRateValue == 10)
@ -297,6 +299,11 @@ namespace BLL
newPointBatchItem.AcceptLevel = "Ⅱ";
}
}
}
else
{
newPointBatchItem.AcceptLevel = "Ⅰ";
}
newPointBatchItem.IsCompletedPoint = false;
BLL.Batch_PointBatchItemService.AddPointBatchItem(newPointBatchItem); // 插入明细表

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

2
HJGL/FineUIPro.Web/Web.config
View File

@ -51,7 +51,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<compilation debug="false" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>

1
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
View File

@ -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);

3
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
View File

@ -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)

9
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
View File

@ -982,8 +982,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
sch = dn.First().XXS;
}
}
if (sch != null)
{
d.Thickness = sch;
}
else
{
errorInfos += (i + 2) + "行,美标壁厚[" + ansi + "]未设置值；";
}
if (dia != null && sch != null)
{

275
HJGL/Model/Model.cs
View File

@ -1155,6 +1155,14 @@ namespace Model
}
}
public System.Data.Linq.Table<View_PMIDetections> View_PMIDetections
{
get
{
return this.GetTable<View_PMIDetections>();
}
}
public System.Data.Linq.Table<View_PTP_TestPackageAudit> 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<int> _PMINum;
private double _RateBys;
private System.Nullable<int> _PMIBySNum;
private double _RateByf;
private System.Nullable<int> _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<int> 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<int> 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<int> 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<bool> _IsHand;
private EntityRef<Welder_Welder> _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<bool> 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<bool> 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
{

2
HJGL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

BIN
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
View File

Binary file not shown.