|
|
@@ -651,14 +651,14 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
//获取维护的变量名称和SQL
|
|
|
dt = (DataTable)dh.ExecuteSql("select lp_name,lp_sql from label left join LABELPARAMETER on la_id= lp_laid where la_id=" + la_id, "select");
|
|
|
- //用标签本身的变量作为最外层的循环条件去匹配
|
|
|
+ //用标签本身的变量作为最外层的循环条件去匹配;
|
|
|
for (int j = 0; j < SingleDoc.Variables.FreeVariables.Count; j++)
|
|
|
{
|
|
|
//将维护的模板参数和模板本身的参数名称进行比对
|
|
|
for (int k = 0; k < dt.Rows.Count; k++)
|
|
|
{
|
|
|
//名称相等的时候,取SQL进行值的查询
|
|
|
- if (SingleDoc.Variables.FreeVariables.Item(j + 1).Name == dt.Rows[k]["lp_name"].ToString())
|
|
|
+ if (SingleDoc.Variables.FreeVariables.Item(j + 1).Name.ToLower() == dt.Rows[k]["lp_name"].ToString().ToLower())
|
|
|
{
|
|
|
//获取打印执行的SQL
|
|
|
string sql = dt.Rows[k]["lp_sql"].ToString();
|
|
|
@@ -695,7 +695,7 @@ namespace UAS_LabelMachine
|
|
|
//保存参数打印
|
|
|
SingleDoc.Save();
|
|
|
SingleDoc.Printer.SwitchTo(SingleLabelPrinter.Text);
|
|
|
- SingleDoc.PrintDocument();
|
|
|
+ //SingleDoc.PrintDocument();
|
|
|
LogManager.DoLog("执行打印单盘,pib_id:" + LabelInf.Rows[CurrentRowIndex].Cells["pib_id1"].Value.ToString() + ",标签地址" + LabelUrl);
|
|
|
LabelInf.Rows[CurrentRowIndex].Cells["pib_ifprint"].Value = true;
|
|
|
}
|