diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index be04f2f..fe476a8 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/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs index 5faf913..4cb2633 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs @@ -492,8 +492,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage ws.SetColumnWidth(7, 5 * 256); ws.SetColumnWidth(8, 5 * 256); ws.SetColumnWidth(9, 5 * 256); - ws.SetColumnWidth(10, 8 * 256); - ws.SetColumnWidth(11, 11 * 256); + ws.SetColumnWidth(10, 4 * 256); + ws.SetColumnWidth(11, 15 * 256); ws.SetColumnWidth(12, 8 * 256); #endregion @@ -629,8 +629,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10); 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("备注"); @@ -680,11 +680,11 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage //焊口号 ws.GetRow(dataIndex).GetCell(4).SetCellValue(pageTb.Rows[j]["WeldJointCode"].ToString()); - //焊工代号 + // 焊工代号 ws.GetRow(dataIndex).GetCell(6).SetCellValue(pageTb.Rows[j]["WelderCode"].ToString()); - //检件材质 + // 检件规格(mm) 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(12).SetCellValue(pageTb.Rows[j]["Remark"].ToString()); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs index cfbaa8e..1e35094 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs @@ -1026,7 +1026,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { List weldMot = new List(); List grooveType = new List(); - List IsFist = new List(); + //List IsFist = new List(); string error = string.Empty; foreach (string pointItemId in selectRow) @@ -1035,7 +1035,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); weldMot.Add(jot.WeldingMethodId); grooveType.Add(jot.GrooveTypeId); - IsFist.Add(pointItem.IsWelderFirst == true ? true : false); + //IsFist.Add(pointItem.IsWelderFirst == true ? true : false); } if (weldMot.Distinct().Count() > 1) @@ -1046,10 +1046,10 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { error = error + "勾选的焊口坡口类型不一至，"; } - if (IsFist.Distinct().Count() > 1) - { - error = error + "勾选的焊口是否首三不一至，"; - } + //if (IsFist.Distinct().Count() > 1) + //{ + // error = error + "勾选的焊口是否首三不一至，"; + //} if (error == string.Empty) { @@ -1076,7 +1076,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage newBatchTrust.WorkAreaId = iso.WorkAreaId; newBatchTrust.WeldingMethodId = weldMot[0]; newBatchTrust.GrooveTypeId = grooveType[0]; - newBatchTrust.IsWelderFirst = IsFist[0]; + //newBatchTrust.IsWelderFirst = IsFist[0]; newBatchTrust.DetectionTypeId = point.DetectionTypeId; newBatchTrust.PipelineId = point.PipelineId; @@ -1182,7 +1182,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage newBatchTrust.WorkAreaId = trust.WorkAreaId; newBatchTrust.WeldingMethodId = trust.WeldingMethodId; newBatchTrust.GrooveTypeId = trust.GrooveTypeId; - newBatchTrust.IsWelderFirst = Convert.ToBoolean(trust.IsWelderFirst); + //newBatchTrust.IsWelderFirst = Convert.ToBoolean(trust.IsWelderFirst); newBatchTrust.DetectionTypeId = trust.DetectionTypeId; newBatchTrust.PipelineId = trust.PipelineId; @@ -1193,7 +1193,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage where x.ProjectId == trust.ProjectId && x.InstallationId == trust.InstallationId && x.WorkAreaId == trust.WorkAreaId && x.UnitId == trust.UnitId && x.WeldingMethodId==trust.WeldingMethodId && x.GrooveTypeId==trust.GrooveTypeId - && x.IsWelderFirst==trust.IsWelderFirst && x.DetectionTypeId == trust.DetectionTypeId + && x.DetectionTypeId == trust.DetectionTypeId && x.PipelineId == trust.PipelineId select x; string toPointBatch = string.Empty; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs index b0d72fe..99ecd3e 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs @@ -276,10 +276,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { result += "焊口已委托" + "|"; } - else - { - t.IsWelderFirst = pointBatchItem.IsWelderFirst; - } + } if (!string.IsNullOrEmpty(col6)) @@ -484,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage 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); - t.IsWelderFirst = pointBatchItem.IsWelderFirst; + //t.IsWelderFirst = pointBatchItem.IsWelderFirst; t.AcceptStandard = pointBatchItem.PointBatchItemId; // 作为点口明细ID t.TopointBatch = pointBatchItem.PointBatchId; @@ -530,7 +527,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage newBatchTrust.WorkAreaId = t.First().WorkAreaId; newBatchTrust.WeldingMethodId = t.First().WeldingMethodId; newBatchTrust.GrooveTypeId = t.First().GrooveTypeId; - newBatchTrust.IsWelderFirst = t.First().IsWelderFirst; + //newBatchTrust.IsWelderFirst = t.First().IsWelderFirst; newBatchTrust.DetectionTypeId = t.First().DetectionTypeId; newBatchTrust.PipelineId = t.First().PipelineId; newBatchTrust.TopointBatch = t.First().TopointBatch; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs index 8024bf1..0767d8e 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs @@ -1714,8 +1714,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage ws.SetColumnWidth(7, 5 * 256); ws.SetColumnWidth(8, 5 * 256); ws.SetColumnWidth(9, 5 * 256); - ws.SetColumnWidth(10, 8 * 256); - ws.SetColumnWidth(11, 11 * 256); + ws.SetColumnWidth(10, 4 * 256); + ws.SetColumnWidth(11, 15 * 256); ws.SetColumnWidth(12, 8 * 256); #endregion @@ -1853,8 +1853,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage region = new CellRangeAddress(rowIndex + 8, rowIndex + 8, 8, 10); 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("备注"); #endregion diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 69f8b12..b6ba7a6 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -29,10 +29,6 @@ namespace Model #region 可扩展性方法定义 partial void OnCreated(); - partial void OnCreated() - { - this.CommandTimeout = 600; - } partial void InsertAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance); @@ -35633,6 +35629,8 @@ namespace Model private string _PipelineId; + private string _WeldJointId; + private string _PipelineCode; 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)")] public string PipelineCode { @@ -36162,8 +36176,6 @@ namespace Model private string _GrooveTypeId; - private int _IsWelderFirst; - 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")] @@ -36502,8 +36498,6 @@ namespace Model private string _GrooveTypeId; - private int _IsWelderFirst; - private System.Nullable _DetectionRateValue; 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")] public System.Nullable DetectionRateValue { @@ -42029,8 +42007,6 @@ namespace Model private string _DetectionTypeCode; - private System.Nullable _IsWelderFirst; - private string _TrustBatchItemId; public View_TrustBathcIn() @@ -42245,22 +42221,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWelderFirst", DbType="Bit")] - public System.Nullable IsWelderFirst - { - get - { - return this._IsWelderFirst; - } - set - { - if ((this._IsWelderFirst != value)) - { - this._IsWelderFirst = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustBatchItemId", DbType="NVarChar(50)")] public string TrustBatchItemId { 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