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

11

This commit is contained in:
佘春生 2024-07-02 10:44:30 +08:00
parent cf8f42d62d
commit efdccd2a2a
7 changed files with 43 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

14
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
View File

@ -492,8 +492,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.SetColumnWidth(7, 5 * 256); ws.SetColumnWidth(7, 5 * 256);
ws.SetColumnWidth(8, 5 * 256); ws.SetColumnWidth(8, 5 * 256);
ws.SetColumnWidth(9, 5 * 256); ws.SetColumnWidth(9, 5 * 256);
ws.SetColumnWidth(10, 8 * 256); ws.SetColumnWidth(10, 4 * 256);
ws.SetColumnWidth(11, 11 * 256); ws.SetColumnWidth(11, 15 * 256);
ws.SetColumnWidth(12, 8 * 256); ws.SetColumnWidth(12, 8 * 256);
#endregion #endregion
@ -629,8 +629,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10); region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10);
ws.AddMergedRegion(region); ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("检件规格"); ws.GetRow(rowIndex + 8).GetCell(8).SetCellValue("焊口规格");
ws.GetRow(rowIndex + 8).GetCell(8).SetCellValue("检件材质"); ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("焊口材质");
ws.GetRow(rowIndex + 8).GetCell(12).SetCellValue("备注"); ws.GetRow(rowIndex + 8).GetCell(12).SetCellValue("备注");
@ -680,11 +680,11 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//焊口号 //焊口号
ws.GetRow(dataIndex).GetCell(4).SetCellValue(pageTb.Rows[j]["WeldJointCode"].ToString()); ws.GetRow(dataIndex).GetCell(4).SetCellValue(pageTb.Rows[j]["WeldJointCode"].ToString());
//焊工代号 // 焊工代号
ws.GetRow(dataIndex).GetCell(6).SetCellValue(pageTb.Rows[j]["WelderCode"].ToString()); ws.GetRow(dataIndex).GetCell(6).SetCellValue(pageTb.Rows[j]["WelderCode"].ToString());
//检件材质 // 检件规格(mm)
ws.GetRow(dataIndex).GetCell(8).SetCellValue(pageTb.Rows[j]["Specification"].ToString()); ws.GetRow(dataIndex).GetCell(8).SetCellValue(pageTb.Rows[j]["Specification"].ToString());
//检件规格(mm) // 检件材质
ws.GetRow(dataIndex).GetCell(11).SetCellValue(pageTb.Rows[j]["MaterialCode"].ToString()); ws.GetRow(dataIndex).GetCell(11).SetCellValue(pageTb.Rows[j]["MaterialCode"].ToString());
//备注 //备注
ws.GetRow(dataIndex).GetCell(12).SetCellValue(pageTb.Rows[j]["Remark"].ToString()); ws.GetRow(dataIndex).GetCell(12).SetCellValue(pageTb.Rows[j]["Remark"].ToString());

18
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
View File

@ -1026,7 +1026,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{ {
List<string> weldMot = new List<string>(); List<string> weldMot = new List<string>();
List<string> grooveType = new List<string>(); List<string> grooveType = new List<string>();
List<bool> IsFist = new List<bool>(); //List<bool> IsFist = new List<bool>();
string error = string.Empty; string error = string.Empty;
foreach (string pointItemId in selectRow) foreach (string pointItemId in selectRow)
@ -1035,7 +1035,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId);
weldMot.Add(jot.WeldingMethodId); weldMot.Add(jot.WeldingMethodId);
grooveType.Add(jot.GrooveTypeId); grooveType.Add(jot.GrooveTypeId);
IsFist.Add(pointItem.IsWelderFirst == true ? true : false); //IsFist.Add(pointItem.IsWelderFirst == true ? true : false);
} }
if (weldMot.Distinct().Count() > 1) if (weldMot.Distinct().Count() > 1)
@ -1046,10 +1046,10 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{ {
error = error + "勾选的焊口坡口类型不一至，"; error = error + "勾选的焊口坡口类型不一至，";
} }
if (IsFist.Distinct().Count() > 1) //if (IsFist.Distinct().Count() > 1)
{ //{
error = error + "勾选的焊口是否首三不一至，"; // error = error + "勾选的焊口是否首三不一至，";
} //}
if (error == string.Empty) if (error == string.Empty)
{ {
@ -1076,7 +1076,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
newBatchTrust.WorkAreaId = iso.WorkAreaId; newBatchTrust.WorkAreaId = iso.WorkAreaId;
newBatchTrust.WeldingMethodId = weldMot[0]; newBatchTrust.WeldingMethodId = weldMot[0];
newBatchTrust.GrooveTypeId = grooveType[0]; newBatchTrust.GrooveTypeId = grooveType[0];
newBatchTrust.IsWelderFirst = IsFist[0]; //newBatchTrust.IsWelderFirst = IsFist[0];
newBatchTrust.DetectionTypeId = point.DetectionTypeId; newBatchTrust.DetectionTypeId = point.DetectionTypeId;
newBatchTrust.PipelineId = point.PipelineId; newBatchTrust.PipelineId = point.PipelineId;
@ -1182,7 +1182,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
newBatchTrust.WorkAreaId = trust.WorkAreaId; newBatchTrust.WorkAreaId = trust.WorkAreaId;
newBatchTrust.WeldingMethodId = trust.WeldingMethodId; newBatchTrust.WeldingMethodId = trust.WeldingMethodId;
newBatchTrust.GrooveTypeId = trust.GrooveTypeId; newBatchTrust.GrooveTypeId = trust.GrooveTypeId;
newBatchTrust.IsWelderFirst = Convert.ToBoolean(trust.IsWelderFirst); //newBatchTrust.IsWelderFirst = Convert.ToBoolean(trust.IsWelderFirst);
newBatchTrust.DetectionTypeId = trust.DetectionTypeId; newBatchTrust.DetectionTypeId = trust.DetectionTypeId;
newBatchTrust.PipelineId = trust.PipelineId; newBatchTrust.PipelineId = trust.PipelineId;
@ -1193,7 +1193,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId
&& x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId && x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId
&& x.WeldingMethodId==trust.WeldingMethodId && x.GrooveTypeId==trust.GrooveTypeId && x.WeldingMethodId==trust.WeldingMethodId && x.GrooveTypeId==trust.GrooveTypeId
&& x.IsWelderFirst==trust.IsWelderFirst && x.DetectionTypeId == trust.DetectionTypeId && x.DetectionTypeId == trust.DetectionTypeId
&& x.PipelineId == trust.PipelineId && x.PipelineId == trust.PipelineId
select x; select x;
string toPointBatch = string.Empty; string toPointBatch = string.Empty;

9
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
View File

@ -276,10 +276,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{ {
result += "焊口已委托" + "|"; result += "焊口已委托" + "|";
} }
else
{
t.IsWelderFirst = pointBatchItem.IsWelderFirst;
}
} }
if (!string.IsNullOrEmpty(col6)) if (!string.IsNullOrEmpty(col6))
@ -484,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
t.DetectionTypeId = nde.DetectionTypeId; t.DetectionTypeId = nde.DetectionTypeId;
var pointBatchItem = trustIn.FirstOrDefault(x => x.WorkAreaId == workArea.WorkAreaId && x.PipelineId == pipe.PipelineId && x.WeldJointId == jot.WeldJointId && x.DetectionTypeId == nde.DetectionTypeId); var pointBatchItem = trustIn.FirstOrDefault(x => x.WorkAreaId == workArea.WorkAreaId && x.PipelineId == pipe.PipelineId && x.WeldJointId == jot.WeldJointId && x.DetectionTypeId == nde.DetectionTypeId);
t.IsWelderFirst = pointBatchItem.IsWelderFirst; //t.IsWelderFirst = pointBatchItem.IsWelderFirst;
t.AcceptStandard = pointBatchItem.PointBatchItemId; // 作为点口明细ID t.AcceptStandard = pointBatchItem.PointBatchItemId; // 作为点口明细ID
t.TopointBatch = pointBatchItem.PointBatchId; t.TopointBatch = pointBatchItem.PointBatchId;
@ -530,7 +527,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
newBatchTrust.WorkAreaId = t.First().WorkAreaId; newBatchTrust.WorkAreaId = t.First().WorkAreaId;
newBatchTrust.WeldingMethodId = t.First().WeldingMethodId; newBatchTrust.WeldingMethodId = t.First().WeldingMethodId;
newBatchTrust.GrooveTypeId = t.First().GrooveTypeId; newBatchTrust.GrooveTypeId = t.First().GrooveTypeId;
newBatchTrust.IsWelderFirst = t.First().IsWelderFirst; //newBatchTrust.IsWelderFirst = t.First().IsWelderFirst;
newBatchTrust.DetectionTypeId = t.First().DetectionTypeId; newBatchTrust.DetectionTypeId = t.First().DetectionTypeId;
newBatchTrust.PipelineId = t.First().PipelineId; newBatchTrust.PipelineId = t.First().PipelineId;
newBatchTrust.TopointBatch = t.First().TopointBatch; newBatchTrust.TopointBatch = t.First().TopointBatch;

8
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
View File

@ -1714,8 +1714,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.SetColumnWidth(7, 5 * 256); ws.SetColumnWidth(7, 5 * 256);
ws.SetColumnWidth(8, 5 * 256); ws.SetColumnWidth(8, 5 * 256);
ws.SetColumnWidth(9, 5 * 256); ws.SetColumnWidth(9, 5 * 256);
ws.SetColumnWidth(10, 8 * 256); ws.SetColumnWidth(10, 4 * 256);
ws.SetColumnWidth(11, 11 * 256); ws.SetColumnWidth(11, 15 * 256);
ws.SetColumnWidth(12, 8 * 256); ws.SetColumnWidth(12, 8 * 256);
#endregion #endregion
@ -1853,8 +1853,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10); region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10);
ws.AddMergedRegion(region); ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("检件规格"); ws.GetRow(rowIndex + 8).GetCell(8).SetCellValue("焊口规格");
ws.GetRow(rowIndex + 8).GetCell(8).SetCellValue("检件材质"); ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("焊口材质");
ws.GetRow(rowIndex + 8).GetCell(12).SetCellValue("备注"); ws.GetRow(rowIndex + 8).GetCell(12).SetCellValue("备注");
#endregion #endregion

76
HJGL/Model/Model.cs
View File

@ -29,10 +29,6 @@ namespace Model
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnCreated(); partial void OnCreated();
partial void OnCreated()
{
this.CommandTimeout = 600;
}
partial void InsertAttachFile(AttachFile instance); partial void InsertAttachFile(AttachFile instance);
partial void UpdateAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance);
partial void DeleteAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance);
@ -35633,6 +35629,8 @@ namespace Model
private string _PipelineId; private string _PipelineId;
private string _WeldJointId;
private string _PipelineCode; private string _PipelineCode;
private string _WeldJointCode; private string _WeldJointCode;
@ -35671,6 +35669,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50)")]
public string WeldJointId
{
get
{
return this._WeldJointId;
}
set
{
if ((this._WeldJointId != value))
{
this._WeldJointId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
public string PipelineCode public string PipelineCode
{ {
@ -36162,8 +36176,6 @@ namespace Model
private string _GrooveTypeId; private string _GrooveTypeId;
private int _IsWelderFirst;
public View_GenerateTrust_FJ() public View_GenerateTrust_FJ()
{ {
} }
@ -36311,22 +36323,6 @@ namespace Model
} }
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWelderFirst", DbType="Int NOT NULL")]
public int IsWelderFirst
{
get
{
return this._IsWelderFirst;
}
set
{
if ((this._IsWelderFirst != value))
{
this._IsWelderFirst = value;
}
}
}
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_GenerateTrustItem")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_GenerateTrustItem")]
@ -36502,8 +36498,6 @@ namespace Model
private string _GrooveTypeId; private string _GrooveTypeId;
private int _IsWelderFirst;
private System.Nullable<int> _DetectionRateValue; private System.Nullable<int> _DetectionRateValue;
private string _PointBatchItemId; private string _PointBatchItemId;
@ -36646,22 +36640,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWelderFirst", DbType="Int NOT NULL")]
public int IsWelderFirst
{
get
{
return this._IsWelderFirst;
}
set
{
if ((this._IsWelderFirst != value))
{
this._IsWelderFirst = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionRateValue", DbType="Int")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionRateValue", DbType="Int")]
public System.Nullable<int> DetectionRateValue public System.Nullable<int> DetectionRateValue
{ {
@ -42029,8 +42007,6 @@ namespace Model
private string _DetectionTypeCode; private string _DetectionTypeCode;
private System.Nullable<bool> _IsWelderFirst;
private string _TrustBatchItemId; private string _TrustBatchItemId;
public View_TrustBathcIn() public View_TrustBathcIn()
@ -42245,22 +42221,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWelderFirst", DbType="Bit")]
public System.Nullable<bool> IsWelderFirst
{
get
{
return this._IsWelderFirst;
}
set
{
if ((this._IsWelderFirst != value))
{
this._IsWelderFirst = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustBatchItemId", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustBatchItemId", DbType="NVarChar(50)")]
public string TrustBatchItemId public string TrustBatchItemId
{ {

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

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