Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -197,7 +197,14 @@ namespace UAS_MES.Make
 
         private void Confirm_Click(object sender, EventArgs e)
         {
-            Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            if (PrintLabel.Items.Count != 0)
+            {
+                Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            }
+            else
+            {
+                OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
+            }
         }
 
         private void StartWeight_Click(object sender, EventArgs e)