修改大箱调用界面标签确认，QC抽检过站修改

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_NEW.cs

@@ -147,36 +147,36 @@ namespace UAS_MES_NEW.OQC
                 dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
                 dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
-                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "良品采集", "OK", User.UserCode, out ErrorMessage))
-                {
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", ms_sncode.Text, "");
-                }
-                else
-                {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                }
+                //if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "良品采集", "OK", User.UserCode, out ErrorMessage))
+                //{
+                OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", ms_sncode.Text, "");
+                //}
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                //}
             }
             else
             {
-                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "不良品采集", "NG", User.UserCode, out ErrorMessage))
-                {
-                    sql.Clear();
-                    //when () then 
-                    sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
-                    sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
-                    sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
-                    sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
-                    dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
-                        oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
-                    dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");
-                }
-                else
-                {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                }
+                //if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "不良品采集", "NG", User.UserCode, out ErrorMessage))
+                //{
+                sql.Clear();
+                //when () then 
+                sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
+                sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
+                sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
+                sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
+                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
+                    oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
+                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
+                OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");
+                //}
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                //}
             }
             BaseUtil.CleanDGVData(CheckTypeDGV);
             ms_prodcode.Clear();

UAS_MES_YDCY/FunctionCode/Packing/Packing_BigBoxWeight.cs

@@ -1,4 +1,5 @@
 using LabelManager2;
+using Seagull.BarTender.Print;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -34,6 +35,8 @@ namespace UAS_MES_NEW.Packing
 
         Thread thread;
 
+        Engine engine;
+
         Thread InitPrint;
 
         //打印计数
@@ -85,8 +88,7 @@ namespace UAS_MES_NEW.Packing
         {
             try
             {
-                lbl = new ApplicationClass();
-                BaseUtil.WriteLbl();
+                engine = new Engine(true);
             }
             catch
             {
@@ -113,6 +115,16 @@ namespace UAS_MES_NEW.Packing
                 if (dt.Rows.Count > 0)
                 {
                     BaseUtil.SetFormValue(this.Controls, dt);
+                    if (pr_change)
+                    {
+                        String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
+                        if (dialog != "OK")
+                        {
+                            OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
+                            return;
+                        }
+                        else pr_change = false;
+                    }
                     pa_outboxcode.Text = outboxcode;
                 }
                 else
@@ -140,7 +152,7 @@ namespace UAS_MES_NEW.Packing
                         {
                             //doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                             string ErrorMessage = "";
-                            if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                            if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
                             {
                                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                             }
@@ -181,6 +193,8 @@ namespace UAS_MES_NEW.Packing
             showResult.Items.Add(lvi);
         }
 
+        bool pr_change = false;
+
         private void pa_prodcode_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='" + pa_prodcode.Text + "' and la_templatetype='大箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
@@ -188,10 +202,7 @@ namespace UAS_MES_NEW.Packing
             PrintLabel.DisplayMember = "la_name";
             PrintLabel.ValueMember = "la_id";
             ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
+            pr_change = true;
         }
 
         private void StartWeight_Click(object sender, EventArgs e)