2023-02-20 001 焊接修改
This commit is contained in:
@@ -5,6 +5,7 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using WIA;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -45,35 +46,57 @@ namespace BLL
|
||||
public static List<Model.SpWeldingDailyItem> GetWeldingDailyItem(string weldingDailyId)
|
||||
{
|
||||
List<Model.SpWeldingDailyItem> returnViewMatch = new List<Model.SpWeldingDailyItem>();
|
||||
var weldlineLists = from x in Funs.DB.View_HJGL_WeldJoint
|
||||
var weldlineLists = (from x in Funs.DB.View_HJGL_WeldJoint
|
||||
where x.WeldingDailyId == weldingDailyId
|
||||
select x;
|
||||
if (weldlineLists.Count() > 0)
|
||||
{
|
||||
foreach (var item in weldlineLists)
|
||||
{
|
||||
Model.SpWeldingDailyItem newWeldReportItem = new Model.SpWeldingDailyItem();
|
||||
newWeldReportItem.WeldJointId = item.WeldJointId;
|
||||
newWeldReportItem.WeldJointCode = item.WeldJointCode;
|
||||
newWeldReportItem.PipelineCode = item.PipelineCode;
|
||||
newWeldReportItem.CoverWelderCode = item.CoverWelderCode;
|
||||
newWeldReportItem.CoverWelderId = item.CoverWelderId;
|
||||
newWeldReportItem.BackingWelderCode = item.BackingWelderCode;
|
||||
newWeldReportItem.BackingWelderId = item.BackingWelderId;
|
||||
//newWeldReportItem.WeldTypeId = item.WeldTypeCode;
|
||||
newWeldReportItem.JointArea = item.JointArea;
|
||||
newWeldReportItem.WeldingLocationId = item.WeldingLocationId;
|
||||
newWeldReportItem.WeldingLocationCode = item.WeldingLocationCode;
|
||||
newWeldReportItem.JointAttribute = item.JointAttribute;
|
||||
newWeldReportItem.Size = item.Size;
|
||||
newWeldReportItem.Dia = item.Dia;
|
||||
newWeldReportItem.Thickness = item.Thickness;
|
||||
newWeldReportItem.WeldingMethodCode = item.WeldingMethodCode;
|
||||
newWeldReportItem.WeldingWireCode = item.WeldingWireCode;
|
||||
newWeldReportItem.WeldingRodCode = item.WeldingRodCode;
|
||||
returnViewMatch.Add(newWeldReportItem);
|
||||
}
|
||||
}
|
||||
select new SpWeldingDailyItem
|
||||
{
|
||||
WeldJointId = x.WeldJointId,
|
||||
WeldJointCode = x.WeldJointCode,
|
||||
PipelineCode = x.PipelineCode,
|
||||
CoverWelderCode = x.CoverWelderCode,
|
||||
CoverWelderId = x.CoverWelderId,
|
||||
BackingWelderCode = x.BackingWelderCode,
|
||||
BackingWelderId = x.BackingWelderId,
|
||||
WeldTypeId = x.WeldTypeCode,
|
||||
JointArea = x.JointArea,
|
||||
WeldingLocationId = x.WeldingLocationId,
|
||||
WeldingLocationCode = x.WeldingLocationCode,
|
||||
JointAttribute = x.JointAttribute,
|
||||
Size = x.Size,
|
||||
Dia = x.Dia,
|
||||
Thickness = x.Thickness,
|
||||
WeldingMethodCode = x.WeldingMethodCode,
|
||||
WeldingWireCode = x.WeldingWireCode,
|
||||
WeldingRodCode = x.WeldingRodCode
|
||||
|
||||
}).ToList();
|
||||
returnViewMatch = weldlineLists;
|
||||
//if (weldlineLists.Count() > 0)
|
||||
//{
|
||||
// foreach (var item in weldlineLists)
|
||||
// {
|
||||
// Model.SpWeldingDailyItem newWeldReportItem = new Model.SpWeldingDailyItem();
|
||||
// newWeldReportItem.WeldJointId = item.WeldJointId;
|
||||
// newWeldReportItem.WeldJointCode = item.WeldJointCode;
|
||||
// newWeldReportItem.PipelineCode = item.PipelineCode;
|
||||
// newWeldReportItem.CoverWelderCode = item.CoverWelderCode;
|
||||
// newWeldReportItem.CoverWelderId = item.CoverWelderId;
|
||||
// newWeldReportItem.BackingWelderCode = item.BackingWelderCode;
|
||||
// newWeldReportItem.BackingWelderId = item.BackingWelderId;
|
||||
// //newWeldReportItem.WeldTypeId = item.WeldTypeCode;
|
||||
// newWeldReportItem.JointArea = item.JointArea;
|
||||
// newWeldReportItem.WeldingLocationId = item.WeldingLocationId;
|
||||
// newWeldReportItem.WeldingLocationCode = item.WeldingLocationCode;
|
||||
// newWeldReportItem.JointAttribute = item.JointAttribute;
|
||||
// newWeldReportItem.Size = item.Size;
|
||||
// newWeldReportItem.Dia = item.Dia;
|
||||
// newWeldReportItem.Thickness = item.Thickness;
|
||||
// newWeldReportItem.WeldingMethodCode = item.WeldingMethodCode;
|
||||
// newWeldReportItem.WeldingWireCode = item.WeldingWireCode;
|
||||
// newWeldReportItem.WeldingRodCode = item.WeldingRodCode;
|
||||
// returnViewMatch.Add(newWeldReportItem);
|
||||
// }
|
||||
//}
|
||||
|
||||
return returnViewMatch;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user