|
@@ -9,6 +9,7 @@ using System.Windows.Forms;
|
|
|
using Seagull.BarTender.Print;
|
|
|
using System.Net;
|
|
|
using System;
|
|
|
+using System.Linq;
|
|
|
|
|
|
namespace UAS_MES_NEW.PublicMethod
|
|
|
{
|
|
@@ -346,6 +347,12 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
MessageBox.Show("标签文件打开失败");
|
|
|
return false;
|
|
|
}
|
|
|
+ string ParamValue = format.SubStrings.GetAll("#", "$");
|
|
|
+ string[] paramname = ParamValue.Split('$');
|
|
|
+ for (int i = 0; i < paramname.Length; i++)
|
|
|
+ {
|
|
|
+ paramname[i] = paramname[i].Split('#')[0];
|
|
|
+ }
|
|
|
//执行全部的SQL
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
@@ -367,6 +374,20 @@ 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 (format.SubStrings[dt.Rows[i]["lp_name"].ToString().ToUpper()] != null)
|
|
@@ -382,20 +403,20 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
//{
|
|
|
// 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;
|
|
|
- }
|
|
|
- }
|
|
|
+ //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;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
}
|
|
|
}
|
|
|
}
|