|
|
@@ -89,16 +89,10 @@ namespace UAS_MES.Make
|
|
|
|
|
|
private void pr_code_TextChanged(object sender, EventArgs e)
|
|
|
{
|
|
|
- DataTable _dt = (DataTable)dh.ExecuteSql("select 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='SN标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
|
|
|
+ DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='SN标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
|
|
|
PrintLabel.DataSource = _dt;
|
|
|
- PrintLabel.DisplayMember = "la_name";
|
|
|
+ PrintLabel.DisplayMember = "la_url";
|
|
|
PrintLabel.ValueMember = "la_id";
|
|
|
- ftpOperater ftp = new ftpOperater();
|
|
|
- indate = new System.DateTime[_dt.Rows.Count];
|
|
|
- for (int i = 0; i < _dt.Rows.Count; i++)
|
|
|
- {
|
|
|
- BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
private void sn_code_KeyDown(object sender, KeyEventArgs e)
|
|
|
@@ -297,8 +291,8 @@ namespace UAS_MES.Make
|
|
|
if (PrintLabel.Items.Count != 0)
|
|
|
{
|
|
|
OperateResult.AppendText(">>打印序列号" + sn_code.Text + "\n", Color.Black);
|
|
|
- doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
|
|
|
- if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
|
|
|
+ doc = lbl.Documents.Open(PrintLabel.Text);
|
|
|
+ if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
|
|
|
{
|
|
|
OperateResult.AppendText(ErrMessage + "\n", Color.Red);
|
|
|
return;
|