|
@@ -16,6 +16,7 @@ using System.Collections.Generic;
|
|
|
using System.Net;
|
|
|
using System.Text;
|
|
|
using HslCommunication.Profinet.Knx;
|
|
|
+using Seagull.BarTender.Print;
|
|
|
|
|
|
namespace UAS_MES_NEW.Make
|
|
|
{
|
|
@@ -99,12 +100,12 @@ namespace UAS_MES_NEW.Make
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ Engine engine;
|
|
|
private void InPrint()
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- lbl = new ApplicationClass();
|
|
|
+ engine = new Engine(true);
|
|
|
BaseUtil.WriteLbl();
|
|
|
}
|
|
|
catch (Exception)
|
|
@@ -259,7 +260,7 @@ namespace UAS_MES_NEW.Make
|
|
|
try
|
|
|
{
|
|
|
int len = serialPort1.BytesToRead;
|
|
|
-
|
|
|
+
|
|
|
Byte[] readBuffer = new Byte[len];
|
|
|
serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
|
|
|
string weigh = Encoding.Default.GetString(readBuffer);
|
|
@@ -324,7 +325,7 @@ namespace UAS_MES_NEW.Make
|
|
|
if (PrintLabel.Items.Count != 0)
|
|
|
{
|
|
|
string oErrorMessage;
|
|
|
- if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
|
|
|
+ if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
|
|
|
{
|
|
|
OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
|
|
|
}
|