修改打印程序，不可重复打印

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -132,14 +132,22 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<<更新成功\n", Color.Green);
                     //刷新grid的历史称重信息；
                     recordResult(pa_outboxcode.Text, weight.Text, System.DateTime.Now.ToString());
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱"+ pa_outboxcode.Text + "称重:"+weight.Text, "称重成功", pa_outboxcode.Text, "");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱" + pa_outboxcode.Text + "称重:" + weight.Text, "称重成功", pa_outboxcode.Text, "");
                     LogicHandler.RecordProdWeight(pa_outboxcode.Text, "BIGBOX", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pa_prodcode.Text, User.UserSourceCode, User.UserName);
                     if (autoprint.Checked == true)
                     {
                         try
                         {
                             doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
-                            Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text));
+                            string ErrorMessage = "";
+                            if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                            {
+
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                            }
                             dh.ExecuteSql("update package set pa_printcount= pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                             printcount++;
                             weightsum.Text = printcount + "";

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -93,7 +93,7 @@ namespace UAS_MES.Make
 
         private void 卡通箱称重_SizeChanged(object sender, EventArgs e)
         {
-            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width-10, weight_label.Location.Y-20);
+            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width - 10, weight_label.Location.Y - 20);
             asc.controlAutoSize(this);
         }
 
@@ -157,8 +157,7 @@ namespace UAS_MES.Make
                     {
                         if (PrintLabel.Items.Count > 0)
                         {
-                            doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
-                            Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text));
+                            Confirm.PerformClick();
                         }
                         else
                         {
@@ -213,7 +212,15 @@ namespace UAS_MES.Make
         private void Confirm_Click(object sender, EventArgs e)
         {
             doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
-            Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text));
+            string ErrorMessage = "";
+            if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
+            {
+
+            }
+            else
+            {
+                OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+            }
         }
 
         //停止进程，关闭串口

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -233,9 +233,15 @@ namespace UAS_MES.Make
                                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                     doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
-                                    Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
-                                    //提示用户打印成功
-                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                    if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    {
+                                        //提示用户打印成功
+                                        OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(ErrorMessage + "\n", Color.Green);
+                                    }
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
                                     //刷新打印数量和剩余数量
                                     dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -97,12 +97,15 @@ namespace UAS_MES.Make
         private void palletcode_KeyDown(object sender, KeyEventArgs e)
         {
             //按下了enter键
-            if (e.KeyCode==Keys.Enter) {
-                if (palletcode.Text=="") {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (palletcode.Text == "")
+                {
                     OperateResult.AppendText("<<输入不能为空\n", Color.Red);
                     return;
                 }
-                if (weight.Text=="") {
+                if (weight.Text == "")
+                {
                     OperateResult.AppendText("<<未读取到重量信息\n", Color.Red);
                     return;
                 }
@@ -111,7 +114,7 @@ namespace UAS_MES.Make
                 sql.Append("select pa_id,pa_prodcode,pr_detail,pa_makecode,pa_salecode,pa_totalqty,");
                 sql.Append("pa_packageqty from package left join product on pr_code=pa_prodcode where ");
                 sql.Append("pa_outboxcode=:code and pa_type='3'");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select",palletcode.Text);
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", palletcode.Text);
                 if (dt.Rows.Count == 0)
                 {
                     OperateResult.AppendText("<<无该栈板号\n", Color.Red, palletcode);
@@ -119,9 +122,9 @@ namespace UAS_MES.Make
                 else
                 {
                     //给页面赋值
-                    BaseUtil.SetFormValue(this.Controls,dt);
+                    BaseUtil.SetFormValue(this.Controls, dt);
                     //刷新grid的历史称重信息；
-                    if (double.Parse(weight.Text.Replace("kg","").Trim()) == 0)
+                    if (double.Parse(weight.Text.Replace("kg", "").Trim()) == 0)
                     {
                         OperateResult.AppendText("<<重量不能等于0\n", Color.Red, palletcode);
                         return;
@@ -129,11 +132,11 @@ namespace UAS_MES.Make
                     // 更新大箱重量
                     sql.Clear();
                     sql.Append("update package set pa_weight=:weight where pa_id=:pa_id ");
-                    dh.ExecuteSql(sql.GetString(),"update",weight.Text.Replace("kg","").Trim(),dt.Rows[0]["pa_id"].ToString());
+                    dh.ExecuteSql(sql.GetString(), "update", weight.Text.Replace("kg", "").Trim(), dt.Rows[0]["pa_id"].ToString());
                     //记录makeprocess    
                     //查询maid
-                    info = (DataTable)dh.ExecuteSql("select ma_id,ma_wccode from make where ma_code='"+pa_makecode.Text+"'","select");
-                    if (info.Rows.Count>0)
+                    info = (DataTable)dh.ExecuteSql("select ma_id,ma_wccode from make where ma_code='" + pa_makecode.Text + "'", "select");
+                    if (info.Rows.Count > 0)
                     {
                         //有值
                         //查询
@@ -142,11 +145,11 @@ namespace UAS_MES.Make
                         sql.Append("mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,");
                         sql.Append("mp_snoutboxcode) values ( makeprocess_seq.nextval,:makecode,:ma_id,:craftcode,:craftname,'栈板称重'");
                         sql.Append(",:result,sysdate,:inman,:workcenter,:linecode,:source,:palletcode) ");
-                        dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "称重成功,栈板号:" + palletcode.Text + ",重量:" + weight.Text.Trim() , User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
+                        dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "称重成功,栈板号:" + palletcode.Text + ",重量:" + weight.Text.Trim(), User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
                         //提示信息栏显示：<< 栈板号：XXXX,重量：xxxx 克，
                         OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text.Trim() + "\n", Color.Green);
                         //记录日志
-                        LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,pa_makecode.Text,User.UserLineCode,User.UserSourceCode,"栈板称重","重量:" + weight.Text.Trim()+"\n",palletcode.Text,"");
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "栈板称重", "重量:" + weight.Text.Trim() + "\n", palletcode.Text, "");
                         //刷新称重计数+1
                         weightedNum.Text = double.Parse(weightedNum.Text) + 1 + "";
                         recordResult(palletcode.Text, weight.Text.Trim(), System.DateTime.Now.ToString());
@@ -162,13 +165,21 @@ namespace UAS_MES.Make
                         {
                             try
                             {
-                                if (PrintLabel.SelectedValue==null)
+                                if (PrintLabel.SelectedValue == null)
                                 {
                                     OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护栈板标签模板\n", Color.Red, palletcode);
                                     return;
                                 }
                                 doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
-                                Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text));
+                                string ErrorMessage = "";
+                                if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text),pa_makecode.Text,pa_prodcode.Text,"栈板标","0",out ErrorMessage))
+                                {
+
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                }
                             }
                             catch (Exception ex)
                             {