|
@@ -374,49 +374,49 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
int LoopTime = Param.Rows.Count > 200 ? 200 : Param.Rows.Count;
|
|
|
for (int j = 0; j < LoopTime; j++)
|
|
|
{
|
|
|
- if (paramname.Contains(dt.Rows[i]["lp_name"].ToString().ToUpper()))
|
|
|
- {
|
|
|
- if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()] != null)
|
|
|
- {
|
|
|
- format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()].Value = Param.Rows[0][0].ToString();
|
|
|
- }
|
|
|
- }
|
|
|
- if (paramname.Contains(dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)))
|
|
|
- {
|
|
|
- if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)] != null)
|
|
|
- {
|
|
|
- format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)].Value = Param.Rows[j][0].ToString(); ;
|
|
|
- }
|
|
|
- }
|
|
|
- //try
|
|
|
+ //if (paramname.Contains(dt.Rows[i]["lp_name"].ToString().ToUpper()))
|
|
|
//{
|
|
|
// if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()] != null)
|
|
|
// {
|
|
|
// format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()].Value = Param.Rows[0][0].ToString();
|
|
|
// }
|
|
|
+ //}
|
|
|
+ //if (paramname.Contains(dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)))
|
|
|
+ //{
|
|
|
// if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)] != null)
|
|
|
// {
|
|
|
// format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)].Value = Param.Rows[j][0].ToString(); ;
|
|
|
// }
|
|
|
//}
|
|
|
- //catch (Exception e)
|
|
|
- //{
|
|
|
- // Console.WriteLine( e.Message);
|
|
|
- //}
|
|
|
- //for (int k = 0; k < format.SubStrings.Count; k++)
|
|
|
+ //try
|
|
|
//{
|
|
|
- // if (j == 0 & format.SubStrings[k].Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper())
|
|
|
+ // if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()] != null)
|
|
|
// {
|
|
|
- // format.SubStrings[k].Value = Param.Rows[0][0].ToString();
|
|
|
- // break;
|
|
|
+ // format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()].Value = Param.Rows[0][0].ToString();
|
|
|
// }
|
|
|
- // //使用SN开头的参数赋值SN1,SN2,SN3等参数
|
|
|
- // if (format.SubStrings[k].Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1))
|
|
|
+ // if (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)] != null)
|
|
|
// {
|
|
|
- // format.SubStrings[k].Value = Param.Rows[j][0].ToString();
|
|
|
- // break;
|
|
|
+ // format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1)].Value = Param.Rows[j][0].ToString(); ;
|
|
|
// }
|
|
|
//}
|
|
|
+ //catch (Exception e)
|
|
|
+ //{
|
|
|
+ // Console.WriteLine( e.Message);
|
|
|
+ //}
|
|
|
+ for (int k = 0; k < format.SubStrings.Count; k++)
|
|
|
+ {
|
|
|
+ if (j == 0 & format.SubStrings[k].Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper())
|
|
|
+ {
|
|
|
+ format.SubStrings[k].Value = Param.Rows[0][0].ToString();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ //使用SN开头的参数赋值SN1,SN2,SN3等参数
|
|
|
+ if (format.SubStrings[k].Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1))
|
|
|
+ {
|
|
|
+ format.SubStrings[k].Value = Param.Rows[j][0].ToString();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|