lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-15

This commit is contained in:
李鹏飞 2023-10-25 10:03:27 +08:00
parent cbb2b0c571
commit 69138c9b08
8 changed files with 146 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DataBase/版本日志/SGGLDB_V2023-10-24.sql
View File

@ -4,3 +4,4 @@ go
alter table dbo.PHTGL_ContractTrack alter table dbo.PHTGL_ContractTrack
add SerialNumber nvarchar(50) add SerialNumber nvarchar(50)
go go

7
DataBase/版本日志/SGGLDB_V2023-10-25.sql Normal file
View File

@ -0,0 +1,7 @@
exec sp_rename 'dbo.Base_DNCompare.Sch5S', SCH5S, 'COLUMN'
go
exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN'
go

68
SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs
View File

@ -1,4 +1,5 @@
using Model; using Model;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -15,6 +16,14 @@ namespace BLL
return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.DNCompareId == dNCompareId); return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.DNCompareId == dNCompareId);
} }
public static Model.Base_DNCompare GetDNCompareByDN(int DN)
{
return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.DN == DN);
}
public static Model.Base_DNCompare GetDNCompareByOutSizeDia(decimal OutSizeDia)
{
return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.OutSizeDia == OutSizeDia);
}
/// <summary> /// <summary>
/// 增加直径寸径对照信息 /// 增加直径寸径对照信息
/// </summary> /// </summary>
@ -28,8 +37,8 @@ namespace BLL
DN = dNCompare.DN, DN = dNCompare.DN,
PipeSize = dNCompare.PipeSize, PipeSize = dNCompare.PipeSize,
OutSizeDia = dNCompare.OutSizeDia, OutSizeDia = dNCompare.OutSizeDia,
Sch5S = dNCompare.Sch5S, SCH5S = dNCompare.SCH5S,
Sch10S = dNCompare.Sch10S, SCH10S = dNCompare.SCH10S,
SCH10 = dNCompare.SCH10, SCH10 = dNCompare.SCH10,
SCH20 = dNCompare.SCH20, SCH20 = dNCompare.SCH20,
SCH30 = dNCompare.SCH30, SCH30 = dNCompare.SCH30,
@ -72,8 +81,8 @@ namespace BLL
newDNCompare.DN = dNCompare.DN; newDNCompare.DN = dNCompare.DN;
newDNCompare.PipeSize = dNCompare.PipeSize; newDNCompare.PipeSize = dNCompare.PipeSize;
newDNCompare.OutSizeDia = dNCompare.OutSizeDia; newDNCompare.OutSizeDia = dNCompare.OutSizeDia;
newDNCompare.Sch5S = dNCompare.Sch5S; newDNCompare.SCH5S = dNCompare.SCH5S;
newDNCompare.Sch10S = dNCompare.Sch10S; newDNCompare.SCH10S = dNCompare.SCH10S;
newDNCompare.SCH10 = dNCompare.SCH10; newDNCompare.SCH10 = dNCompare.SCH10;
newDNCompare.SCH20 = dNCompare.SCH20; newDNCompare.SCH20 = dNCompare.SCH20;
newDNCompare.SCH30 = dNCompare.SCH30; newDNCompare.SCH30 = dNCompare.SCH30;
@ -130,6 +139,57 @@ namespace BLL
return list; return list;
} }
/// <summary>
/// 根据DN直径获取壁厚
/// </summary>
/// <param name="DN"></param>
/// <param name="sch"></param>
/// <returns></returns>
public static decimal? GetThicknessByDNDia(int DN,string sch)
{
decimal result = 0;
var q = GetDNCompareByDN(DN);
if (q!=null)
{
var diaProperty = q.GetType().GetProperty(sch);
diaProperty = (diaProperty == null ? q.GetType().GetProperty(sch.Replace("Sch", "SCH")) : diaProperty);
if (diaProperty != null)
{
var diaValue = diaProperty.GetValue(q);
result = Funs.GetNewDecimalOrZero(diaValue?.ToString());
}
}
return result;
}
/// <summary>
/// 根据外径获取壁厚
/// </summary>
/// <param name="Dia"></param>
/// <param name="sch"></param>
/// <returns></returns>
public static decimal? GetThicknessByDia(decimal? Dia, string sch)
{
decimal result = 0;
sch = sch.Replace("", "");
var q = GetDNCompareByOutSizeDia((decimal)Dia);
if (q != null)
{
var diaProperty = q.GetType().GetProperty(sch);
diaProperty = (diaProperty == null ? q.GetType().GetProperty(sch.Replace("Sch", "SCH")) : diaProperty);
if (diaProperty != null)
{
var diaValue = diaProperty.GetValue(q);
result = Funs.GetNewDecimalOrZero(diaValue?.ToString());
}
}
return result;
}
public static decimal? GetSizeByDia(decimal dia) public static decimal? GetSizeByDia(decimal dia)
{ {
var q = Funs.DB.Base_DNCompare.FirstOrDefault(x => x.OutSizeDia == dia); var q = Funs.DB.Base_DNCompare.FirstOrDefault(x => x.OutSizeDia == dia);

8
SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx
View File

@ -64,11 +64,11 @@
<f:RenderField Width="100px" ColumnID="OutSizeDia" DataField="OutSizeDia" FieldType="Float" Locked="true" <f:RenderField Width="100px" ColumnID="OutSizeDia" DataField="OutSizeDia" FieldType="Float" Locked="true"
HeaderText="外径(mm)" HeaderTextAlign="Center" TextAlign="Left" SortField="OutSizeDia"> HeaderText="外径(mm)" HeaderTextAlign="Center" TextAlign="Left" SortField="OutSizeDia">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="Sch5S" DataField="Sch5S" FieldType="Float" <f:RenderField Width="120px" ColumnID="SCH5S" DataField="SCH5S" FieldType="Float"
HeaderText="SCH5S/SCH5" HeaderTextAlign="Center" TextAlign="Left" SortField="Sch5S"> HeaderText="SCH5S/SCH5" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH5S">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="Sch10S" DataField="Sch10S" FieldType="Float" <f:RenderField Width="80px" ColumnID="SCH10S" DataField="SCH10S" FieldType="Float"
HeaderText="SCH10S" HeaderTextAlign="Center" TextAlign="Left" SortField="Sch10S"> HeaderText="SCH10S" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH10S">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="SCH10" DataField="SCH10" FieldType="Float" <f:RenderField Width="80px" ColumnID="SCH10" DataField="SCH10" FieldType="Float"
HeaderText="SCH10" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH10"> HeaderText="SCH10" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH10">

12
SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs
View File

@ -46,13 +46,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo
{ {
this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString(); this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString();
} }
if (DNCompare.Sch5S.HasValue) if (DNCompare.SCH5S.HasValue)
{ {
this.txtSCH5S.Text = DNCompare.Sch5S.ToString(); this.txtSCH5S.Text = DNCompare.SCH5S.ToString();
} }
if (DNCompare.Sch10S.HasValue) if (DNCompare.SCH10S.HasValue)
{ {
this.txtSCH10S.Text = DNCompare.Sch10S.ToString(); this.txtSCH10S.Text = DNCompare.SCH10S.ToString();
} }
if (DNCompare.SCH10.HasValue) if (DNCompare.SCH10.HasValue)
{ {
@ -164,8 +164,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
newDNCompare.PipeSize = Funs.GetNewDecimal(this.txtPipeSize.Text.Trim()); newDNCompare.PipeSize = Funs.GetNewDecimal(this.txtPipeSize.Text.Trim());
newDNCompare.DN = Funs.GetNewInt(this.txtDN.Text.Trim()); newDNCompare.DN = Funs.GetNewInt(this.txtDN.Text.Trim());
newDNCompare.OutSizeDia = Funs.GetNewDecimal(this.txtOutSizeDia.Text.Trim()); newDNCompare.OutSizeDia = Funs.GetNewDecimal(this.txtOutSizeDia.Text.Trim());
newDNCompare.Sch5S = Funs.GetNewDecimal(this.txtSCH5S.Text.Trim()); newDNCompare.SCH5S = Funs.GetNewDecimal(this.txtSCH5S.Text.Trim());
newDNCompare.Sch10S = Funs.GetNewDecimal(this.txtSCH10S.Text.Trim()); newDNCompare.SCH10S = Funs.GetNewDecimal(this.txtSCH10S.Text.Trim());
newDNCompare.SCH10 = Funs.GetNewDecimal(this.txtSCH10.Text.Trim()); newDNCompare.SCH10 = Funs.GetNewDecimal(this.txtSCH10.Text.Trim());
newDNCompare.SCH20 = Funs.GetNewDecimal(this.txtSCH20.Text.Trim()); newDNCompare.SCH20 = Funs.GetNewDecimal(this.txtSCH20.Text.Trim());
newDNCompare.SCH30 = Funs.GetNewDecimal(this.txtSCH30.Text.Trim()); newDNCompare.SCH30 = Funs.GetNewDecimal(this.txtSCH30.Text.Trim());

8
SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs
View File

@ -27,13 +27,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo
{ {
this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString(); this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString();
} }
if (DNCompare.Sch5S.HasValue) if (DNCompare.SCH5S.HasValue)
{ {
this.txtSCH5S.Text = DNCompare.Sch5S.ToString(); this.txtSCH5S.Text = DNCompare.SCH5S.ToString();
} }
if (DNCompare.Sch10S.HasValue) if (DNCompare.SCH10S.HasValue)
{ {
this.txtSCH10S.Text = DNCompare.Sch10S.ToString(); this.txtSCH10S.Text = DNCompare.SCH10S.ToString();
} }
if (DNCompare.SCH10.HasValue) if (DNCompare.SCH10.HasValue)
{ {

24
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
View File

@ -595,10 +595,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var col24 = Convert.ToString(pds[i].Z); var col24 = Convert.ToString(pds[i].Z);
if (col24!=null) if (col24!=null)
{
// var Thickness = Convert.ToDecimal(col24);
decimal Thickness = 0;
string thickness = col24.ToString();
if (thickness.Contains("Sch") || thickness.Contains("SCH"))
{
if (rbDiaType.SelectedValue == "1")//外径
{
Thickness = (decimal)BLL.Base_DNCompareService.GetThicknessByDia(pipeline.Dia,thickness);
pipeline.Thickness = Thickness;
}
else //DN直径
{
Thickness = (decimal)BLL.Base_DNCompareService.GetThicknessByDNDia(int.Parse( pipeline.DNDia.Replace("DN","")), thickness);
pipeline.Thickness = Thickness;
}
}
else
{ {
try try
{ {
var Thickness = Convert.ToDecimal(col24);
Thickness = Convert.ToDecimal(col24);
pipeline.Thickness = Thickness; pipeline.Thickness = Thickness;
//是否根据壁厚计算达因 //是否根据壁厚计算达因
//Model.Project_Sys_Set thicknessSet = BLL.Project_SysSetService.GetSysSetBySetId("7", this.CurrUser.LoginProjectId); //Model.Project_Sys_Set thicknessSet = BLL.Project_SysSetService.GetSysSetBySetId("7", this.CurrUser.LoginProjectId);
@ -614,6 +633,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
result.Add("第" + (i + 1).ToString() + "行," + "壁厚格式输入有误" + "|"); result.Add("第" + (i + 1).ToString() + "行," + "壁厚格式输入有误" + "|");
} }
}
} }
else else
{ {

44
SGGL/Model/Model.cs
View File

@ -19345,9 +19345,9 @@ namespace Model
private System.Nullable<decimal> _OutSizeDia; private System.Nullable<decimal> _OutSizeDia;
private System.Nullable<decimal> _Sch5S; private System.Nullable<decimal> _SCH5S;
private System.Nullable<decimal> _Sch10S; private System.Nullable<decimal> _SCH10S;
private System.Nullable<decimal> _SCH10; private System.Nullable<decimal> _SCH10;
@ -19407,10 +19407,10 @@ namespace Model
partial void OnPipeSizeChanged(); partial void OnPipeSizeChanged();
partial void OnOutSizeDiaChanging(System.Nullable<decimal> value); partial void OnOutSizeDiaChanging(System.Nullable<decimal> value);
partial void OnOutSizeDiaChanged(); partial void OnOutSizeDiaChanged();
partial void OnSch5SChanging(System.Nullable<decimal> value); partial void OnSCH5SChanging(System.Nullable<decimal> value);
partial void OnSch5SChanged(); partial void OnSCH5SChanged();
partial void OnSch10SChanging(System.Nullable<decimal> value); partial void OnSCH10SChanging(System.Nullable<decimal> value);
partial void OnSch10SChanged(); partial void OnSCH10SChanged();
partial void OnSCH10Changing(System.Nullable<decimal> value); partial void OnSCH10Changing(System.Nullable<decimal> value);
partial void OnSCH10Changed(); partial void OnSCH10Changed();
partial void OnSCH20Changing(System.Nullable<decimal> value); partial void OnSCH20Changing(System.Nullable<decimal> value);
@ -19544,42 +19544,42 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sch5S", DbType="Decimal(9,1)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SCH5S", DbType="Decimal(9,1)")]
public System.Nullable<decimal> Sch5S public System.Nullable<decimal> SCH5S
{ {
get get
{ {
return this._Sch5S; return this._SCH5S;
} }
set set
{ {
if ((this._Sch5S != value)) if ((this._SCH5S != value))
{ {
this.OnSch5SChanging(value); this.OnSCH5SChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._Sch5S = value; this._SCH5S = value;
this.SendPropertyChanged("Sch5S"); this.SendPropertyChanged("SCH5S");
this.OnSch5SChanged(); this.OnSCH5SChanged();
} }
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sch10S", DbType="Decimal(9,1)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SCH10S", DbType="Decimal(9,1)")]
public System.Nullable<decimal> Sch10S public System.Nullable<decimal> SCH10S
{ {
get get
{ {
return this._Sch10S; return this._SCH10S;
} }
set set
{ {
if ((this._Sch10S != value)) if ((this._SCH10S != value))
{ {
this.OnSch10SChanging(value); this.OnSCH10SChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._Sch10S = value; this._SCH10S = value;
this.SendPropertyChanged("Sch10S"); this.SendPropertyChanged("SCH10S");
this.OnSch10SChanged(); this.OnSCH10SChanged();
} }
} }
} }