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

焊接修改

Browse Source
This commit is contained in:
李鹏飞
2024-10-17 21:46:32 +08:00
parent 022aebc00d
commit fec4225aff
62 changed files with 4200 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx
+3
View File
@@ -218,6 +218,9 @@
</f:RenderField>
<f:RenderField Width="80px" HeaderText="焊条" ColumnID="Value37" DataField="Value37"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="特殊规格" ColumnID="Value39" DataField="Value39"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
<Listeners>
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs
+26 -5
View File
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,
Value8,Value9,Value10,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,
Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30,Value31,
Value32,Value33,Value34,Value35,Value36,Value37,Value38
Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39
FROM Sys_DataInTemp
WHERE UserId=@UserId";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -355,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim();
newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim();
newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim();
newDataInTemp.Value39 = ds.Tables[0].Rows[i][38].ToString().Trim();
BLL.DataInTempService.AddDataInTemp(newDataInTemp);
}
@@ -1525,15 +1526,23 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
if (!string.IsNullOrEmpty(tempData.Value37))
{
var weldMat = consumabless.FirstOrDefault(x => x.ConsumablesCode == tempData.Value37 && x.ConsumablesType == "2");
if (weldMat == null)
if (tempData.Value37=="NULL")
{
errInfo += "焊条[" + tempData.Value37 + "]不存在；";
weldJoint.WeldMatId = null;
}
else
{
weldJoint.WeldMatId = weldMat.ConsumablesId;
var weldMat = consumabless.FirstOrDefault(x => x.ConsumablesCode == tempData.Value37 && x.ConsumablesType == "2");
if (weldMat == null)
{
errInfo += "焊条[" + tempData.Value37 + "]不存在；";
}
else
{
weldJoint.WeldMatId = weldMat.ConsumablesId;
}
}
}
else
{
@@ -1561,6 +1570,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
weldJoint.IsPMI = jot.IsPMI;
}
}
if (!string.IsNullOrEmpty(tempData.Value39))
{
weldJoint.IsBracket = true;
weldJoint.Specification = tempData.Value39;
}
else
{
if (jot != null && jot.IsBracket != null)
{
weldJoint.IsBracket = jot.IsBracket;
}
}
if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口
{