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

11

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
+7 -7
View File
@@ -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());
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+9 -9
View File
@@ -1026,7 +1026,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
List<string> weldMot = 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;
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;
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
+3 -6
View File
@@ -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;
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
+4 -4
View File
@@ -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