补打标签和取消上传电源数据

UAS_MES_HYSX/FunctionCode/Make/Make_FeedingCollection.cs

@@ -513,7 +513,7 @@ namespace UAS_MES_NEW.Make
                 if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {
                     //提示正确返回时传递的信息
-                    HttpServer.SendPowerCode(sn_code.Text);
+                    //HttpServer.SendPowerCode(sn_code.Text);
                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                     sn_code.Text = "";

UAS_MES_HYSX/FunctionCode/Make/Make_RePrintLabel.cs

@@ -37,6 +37,8 @@ namespace UAS_MES_NEW.Make
         string type = "";
 
         string errorMessage = "";
+
+        bool pr_change = false;
         public Make_RePrintLabel()
         {
             InitializeComponent();
@@ -252,6 +254,16 @@ namespace UAS_MES_NEW.Make
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
                 }
+                if (pr_change)
+                {
+                    String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
+                    if (dialog != "OK")
+                    {
+                        OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
+                        return;
+                    }
+                    else pr_change = false;
+                }
                 print_Click(sender, new EventArgs());
             }
 
@@ -286,6 +298,7 @@ namespace UAS_MES_NEW.Make
                 PrintLabel.DisplayMember = "la_url";
                 PrintLabel.ValueMember = "la_id";
             }
+            pr_change = true;
         }
         private void print_Click(object sender, EventArgs e)
         {