|
|
@@ -106,7 +106,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
if (Print.SinglePrint(Tag.ToString(), engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, inputText.Text, int.Parse(PrintNum.Text),"", pr_code.Text, "自定义", "-1", out oErrorMessage))
|
|
|
{
|
|
|
- OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
|
|
|
+ OperateResult.AppendText(oErrorMessage + "\n");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -246,8 +246,8 @@ namespace UAS_MES_NEW.Make
|
|
|
Console.WriteLine(listA.Rows[0]["la_isdefault"].ToString());
|
|
|
{
|
|
|
//说明没有默认的模板，那就取pl_id最大的
|
|
|
- listA = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id,'" + la_code + "'la_code from FILEPATH where fp_id in (select * from table(select parsestring(LA_SOFTTYPE,';') from label where la_id='" + la_id + "' ) where COLUMN_VALUE is not null)", "select");
|
|
|
- //listA = (DataTable)dh.ExecuteSql("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault", "select");
|
|
|
+ //listA = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id,'" + la_code + "'la_code from FILEPATH where fp_id in (select * from table(select parsestring(LA_SOFTTYPE,';') from label where la_id='" + la_id + "' ) where COLUMN_VALUE is not null)", "select");
|
|
|
+ listA = (DataTable)dh.ExecuteSql("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault", "select");
|
|
|
}
|
|
|
//标签显示
|
|
|
PrintLabel.DataSource = listA;
|
callm