彩盒标打印修改

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -38,6 +38,8 @@ namespace UAS_MES.Make
         //保存TSN编号
         string ms_id = null;
 
+        bool pr_change = false;
+
         Thread InitPrint;
         ApplicationClass lbl;
 
@@ -70,7 +72,7 @@ namespace UAS_MES.Make
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
 
-            OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)
@@ -94,6 +96,7 @@ namespace UAS_MES.Make
             try
             {
                 lbl = new ApplicationClass();
+                BaseUtil.WriteLbl(lbl);
             }
             catch (Exception ex)
             {
@@ -110,7 +113,7 @@ namespace UAS_MES.Make
                     if (sncode.Text == "")
                     {
                         OperateResult.AppendText(">>TSN不能为空\n", Color.Red);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         return;
                     }
                     sql.Clear();
@@ -122,13 +125,13 @@ namespace UAS_MES.Make
                         ms_id = dt.Rows[0][0].ToString();
                         sncode.Text = "";
                         sncode.Focus();
-                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         return;
                     }
                     else {
                         sncode.Text = "";
                         OperateResult.AppendText(">>TSN错误,不存在\n", Color.Red);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         return;
                     }
                 }
@@ -149,7 +152,7 @@ namespace UAS_MES.Make
                     {
                         sncode.Text = "";
                         OperateResult.AppendText(">>TSN和SN不一致\n", Color.Red);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         ms_id = null;
                         return;
                     }
@@ -177,6 +180,17 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
                                 //提示用户“<< 序列号：XXXX”
                                 OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                                if (pr_change)
+                                {
+                                    String dialog = MessageBox.Show("产品更改，确认标签模板选择正确", "提示", MessageBoxButtons.OKCancel).ToString();
+                                    if (dialog != "OK")
+                                    {
+                                        OperateResult.AppendText(">>产品编号改变，请重新选择标签模板\n", Color.Green);
+                                        return;
+                                    }
+                                    else
+                                    pr_change = false;
+                                }
                             }
                             else
                             {
@@ -207,7 +221,7 @@ namespace UAS_MES.Make
                                         sncode.Text = "";
                                         sncode.Focus();
                                         //提示用户“>>请输入SN”
-                                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                         return;
                                     }
                                     Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
@@ -229,10 +243,10 @@ namespace UAS_MES.Make
                                 }
                                 if (CheckTSN.Checked == true)
                                 {
-                                    OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                                    OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                                     ms_id = null;
                                 }else
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
                         }
                         else
@@ -240,11 +254,11 @@ namespace UAS_MES.Make
                             sncode.Text = "";
                             OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                             if (CheckTSN.Checked == true) {
-                                OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                                 ms_id = null;
                             }
                             else
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
                     }
                     else {
@@ -252,11 +266,11 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                         if (CheckTSN.Checked == true)
                         {
-                            OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                             ms_id = null;
                         }
                         else
-                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                 }
                 else
@@ -265,11 +279,11 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                     if (CheckTSN.Checked == true)
                     {
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         ms_id = null;
                     }
                     else
-                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 }
             }
         }
@@ -288,6 +302,7 @@ namespace UAS_MES.Make
                 BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
                 indate[i] = Convert.ToDateTime(dt.Rows[i]["pl_indate"].ToString());
             }
+            pr_change = true;
         }
 
         private void Make_ColorBoxLabelPrint_Activated(object sender, EventArgs e)
@@ -332,14 +347,14 @@ namespace UAS_MES.Make
             {
                 ms_id = null;
                 OperateResult.AppendText(">>切换至检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入TSN\n", Color.Green);
+                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                 sncode.Text = "";
                 sncode.Focus();
             }
             else {
                 ms_id = null;
                 OperateResult.AppendText(">>切换至不检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 sncode.Text = "";
                 sncode.Focus();
             }

UAS-MES/Main.cs

@@ -94,14 +94,8 @@ namespace UAS_MES
                     string lblid = line.Split('|')[1];
                     try
                     {
-                        if (System.Diagnostics.Process.GetProcessById(int.Parse(processid)).ProcessName == System.Diagnostics.Process.GetCurrentProcess().ProcessName)
-                        {
-                        }
-                        else
-                        {
-                            System.Diagnostics.Process.GetProcessById(int.Parse(lblid)).Kill();
-                        }
-                        
+                        if (System.Diagnostics.Process.GetProcessById(int.Parse(processid)).ProcessName != System.Diagnostics.Process.GetCurrentProcess().ProcessName)
+                            System.Diagnostics.Process.GetProcessById(int.Parse(lblid)).Kill();   
                     }
                     catch (Exception)
                     {
@@ -112,7 +106,6 @@ namespace UAS_MES
                         catch (Exception)
                         {
                         }
-                        Console.WriteLine("删除");
                         FileStream fs = new FileStream(Directory.GetCurrentDirectory() + @"\" + "lblprocess" + ".txt", FileMode.Open, FileAccess.Read);
                         StreamReader sr = new StreamReader(fs);
                         String s = sr.ReadToEnd();