This commit is contained in:
2024-07-01 09:29:35 +08:00
parent 3990f747ce
commit 26d1774fb1
35 changed files with 1432 additions and 488 deletions
@@ -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,Value40
FROM Sys_DataInTemp
WHERE UserId=@UserId";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -1194,31 +1194,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
}
}
if (!string.IsNullOrEmpty(tempData.Value39))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value39);
if (cood == null)
{
errInfo += "Coode1:[" + tempData.Value39 + "]不存在;";
}
else
{
weldJoint.Coode1 = cood.Coode;
}
}
if (!string.IsNullOrEmpty(tempData.Value40))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value40);
if (cood == null)
{
errInfo += "Coode2:[" + tempData.Value40 + "]不存在;";
}
else
{
weldJoint.Coode2 = cood.Coode;
}
}
weldJoint.Coode1 = tempData.Value39;
weldJoint.Coode2 = tempData.Value40;
if (!string.IsNullOrEmpty(tempData.Value25))
{